adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-09 13:02:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/1.3' into 2.0

Browse source 
Conflicts:
	cake/console/templates/default/views/home.ctp
	cake/libs/controller/controller.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/view/media.test.php
	cake/tests/lib/cake_test_case.php
	cake/tests/lib/code_coverage_manager.php
	cake/tests/test_app/views/pages/home.ctp
	lib/Cake/Cache/Engine/ApcEngine.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/View/Helper/FormHelper.php
This commit is contained in:
Jose Lorenzo Rodriguez 2011-07-25 14:44:23 -04:30
commit febf28f34b
9 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/Utility/Sanitize.php
View file

@ -232,7 +232,7 @@ class Sanitize {
return $data;
} else {
if ($options['odd_spaces']) {
$data = str_replace(chr(0xCA), '', str_replace(' ', ' ', $data));
$data = str_replace(chr(0xCA), '', $data);
}
if ($options['encode']) {
$data = Sanitize::html($data, array('remove' => $options['remove_html']));
@ -243,7 +243,6 @@ class Sanitize {
if ($options['carriage']) {
$data = str_replace("\r", "", $data);
}
if ($options['unicode']) {
$data = preg_replace("/&#([0-9]+);/s", "&#\\1;", $data);
}