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

Merge branch 'master' into 2.3

Browse source 
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
This commit is contained in:
mark_story 2012-11-10 21:33:26 -05:00
commit e0aab77dab
20 changed files with 127 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Model/Validator/CakeValidationRule.php
View file

@ -163,9 +163,9 @@ class CakeValidationRule {
*/
public function checkRequired($field, &$data) {
return (
(!isset($data[$field]) && $this->isRequired() === true) ||
(!array_key_exists($field, $data) && $this->isRequired() === true) ||
(
isset($data[$field]) && (empty($data[$field]) &&
array_key_exists($field, $data) && (empty($data[$field]) &&
!is_numeric($data[$field])) && $this->allowEmpty === false
)
);