Fixing issue where whitelist would not be used for validation. Test c…

…ase added. Fixes #1037
cakephp · Aug 22, 2010 · 5446a06 · 5446a06
1 parent 12d4b52
commit 5446a06
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
@@ -2511,7 +2511,7 @@ function invalidFields($options = array()) {
 		$_validate = $this->validate;
 		$whitelist = $this->whitelist;
 
-		if (array_key_exists('fieldList', $options)) {
+		if (!empty($options['fieldList'])) {
 			$whitelist = $options['fieldList'];
 		}
 

diff --git a/cake/tests/cases/libs/model/model_validation.test.php b/cake/tests/cases/libs/model/model_validation.test.php
@@ -164,11 +164,34 @@ function testInvalidFieldsWithFieldListParams() {
 		$TestModel->invalidFields();
 		$expected = array('name' => 'This field cannot be left blank');
 		$this->assertEqual($TestModel->validationErrors, $expected);
-		$TestModel->validationErrors = array();
 
 		$this->assertEqual($TestModel->validate, $validate);
 	}
 
+/**
+ * Test that invalidFields() integrates well with save().  And that fieldList can be an empty type.
+ *
+ * @return void
+ */
+	function testInvalidFieldsWhitelist() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate = $validate = array(
+			'title' => array(
+				'rule' => 'customValidator',
+				'required' => true
+			),
+			'name' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true
+		));
+
+		$TestModel->whitelist = array('name');
+		$TestModel->save(array('name' => '#$$#'));
+
+		$expected = array('name' => 'This field cannot be left blank');
+		$this->assertEqual($TestModel->validationErrors, $expected);
+	}
+
 /**
  * testValidates method
  *