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

fixes #6203, Model::invalidFields respecting Model::whitelist

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8113 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2009-03-17 18:19:12 +00:00
parent 7f853532d9
commit de5907326e
2 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/model/model.php
View file

@ -2343,9 +2343,15 @@ class Model extends Overloadable {
$this->exists(); $this->exists();
$_validate = $this->validate; $_validate = $this->validate;
if (array_key_exists('fieldList', $options) && is_array($options['fieldList']) && !empty($options['fieldList'])) { $whitelist = $this->whitelist;
if (array_key_exists('fieldList', $options)) {
$whitelist = $options['fieldList'];
}
if (!empty($whitelist)) {
$validate = array(); $validate = array();
foreach ($options['fieldList'] as $f) { foreach ((array)$whitelist as $f) {
if (!empty($this->validate[$f])) { if (!empty($this->validate[$f])) {
$validate[$f] = $this->validate[$f]; $validate[$f] = $this->validate[$f];
} }

7
cake/tests/cases/libs/model/model.test.php
View file

@ -4983,6 +4983,13 @@ class ModelTest extends CakeTestCase {
$TestModel->invalidFields(array('fieldList' => array('name', 'title'))); $TestModel->invalidFields(array('fieldList' => array('name', 'title')));
$expected = array('name' => 'This field cannot be left blank', 'title' => 'This field cannot be left blank'); $expected = array('name' => 'This field cannot be left blank', 'title' => 'This field cannot be left blank');
$this->assertEqual($TestModel->validationErrors, $expected); $this->assertEqual($TestModel->validationErrors, $expected);
$TestModel->validationErrors = array();
$TestModel->whitelist = array('name');
$TestModel->invalidFields();
$expected = array('name' => 'This field cannot be left blank');
$this->assertEqual($TestModel->validationErrors, $expected);
$TestModel->validationErrors = array();
$this->assertEqual($TestModel->validate, $validate); $this->assertEqual($TestModel->validate, $validate);
} }