adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' of github.com:cakephp/cakephp into 2.0

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-10-27 22:25:37 -04:30
commit aabfad9a09
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp
View file

@ -1,2 +1 @@
<?php echo '<?xml version="1.0" encoding="' . Configure::read('App.encoding') . '"?>'; ?>
<?php echo $content_for_layout; ?>

9
lib/Cake/Test/Case/BasicsTest.php
View file

@ -19,6 +19,7 @@
require_once CAKE . 'basics.php';
App::uses('Folder', 'Utility');
App::uses('CakeResponse', 'Network');
/**
* BasicsTest class
@ -234,6 +235,14 @@ class BasicsTest extends CakeTestCase {
'n' => '&nbsp;'
);
$this->assertEqual($expected, $result);
$obj = new stdClass();
$result = h($obj);
$this->assertEquals('(object)stdClass', $result);
$obj = new CakeResponse(array('body' => 'Body content'));
$result = h($obj);
$this->assertEquals('Body content', $result);
}
/**

1
lib/Cake/View/Layouts/xml/default.ctp
View file

@ -1,2 +1 @@
<?php echo '<?xml version="1.0" encoding="' . Configure::read('App.encoding') . '"?>'; ?>
<?php echo $content_for_layout; ?>

10
lib/Cake/basics.php
View file

@ -148,7 +148,9 @@ if (!function_exists('sortByKey')) {
/**
* Convenience method for htmlspecialchars.
*
* @param string $text Text to wrap through htmlspecialchars
* @param mixed $text Text to wrap through htmlspecialchars. Also works with arrays, and objects.
* Arrays will be mapped and have all their elements escaped. Objects will be string cast if they
* implement a `__toString` method. Otherwise the class name will be used.
* @param boolean $double Encode existing html entities
* @param string $charset Character set to use when escaping. Defaults to config value in 'App.encoding' or 'UTF-8'
* @return string Wrapped text
@ -161,6 +163,12 @@ function h($text, $double = true, $charset = null) {
$texts[$k] = h($t, $double, $charset);
}
return $texts;
} elseif (is_object($text)) {
if (method_exists($text, '__toString')) {
$text = (string) $text;
} else {
$text = '(object)' . get_class($text);
}
}
static $defaultCharset = false;