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

Merge remote branch 'origin/2.0' into 2.0-class-loading

Browse source 
Conflicts:
	cake/tests/cases/libs/controller_test_case.test.php
	lib/Cake/Controller/ComponentCollection.php
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/TestSuite/Fixture/CakeTestFixture.php
	lib/Cake/View/pages/home.ctp
This commit is contained in:
José Lorenzo Rodríguez 2011-01-22 01:00:15 -04:30
commit d9c99b5ef6
59 changed files with 849 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Utility/Validation.php
View file

@ -246,7 +246,7 @@ class Validation {
}
break;
default:
self::$errors[] = __('You must define the $operator parameter for Validation::comparison()', true);
self::$errors[] = __('You must define the $operator parameter for Validation::comparison()');
break;
}
return false;
@ -265,7 +265,7 @@ class Validation {
extract(self::_defaults($check));
}
if ($regex === null) {
self::$errors[] = __('You must define a regular expression for Validation::custom()', true);
self::$errors[] = __('You must define a regular expression for Validation::custom()');
return false;
}
return self::_check($check, $regex);