Apply patch from 'Eärendil' to fix FormHelper.

Fixes Model.field.1 style fields when used with SecurityComponent. Fixes #2011
cakephp · Sep 23, 2011 · a65a5eb · a65a5eb
1 parent 6a05cad
commit a65a5eb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -439,6 +439,12 @@ function __secure($field = null, $value = null) {
 				}
 			}
 		}
+
+		$last = end($field);
+		if (is_numeric($last) || empty($last)) {
+			array_pop($field);
+		}
+
 		$field = implode('.', $field);
 		if (!in_array($field, $this->fields)) {
 			if ($value !== null) {

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -997,6 +997,20 @@ function testFormSecurityMultipleInputFields() {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test form security with Model.field.0 style inputs
+ *
+ * @return void
+ */
+	function testFormSecurityArrayFields() {
+		$key = 'testKey';
+
+		$this->Form->params['_Token']['key'] = $key;
+		$this->Form->create('Address');
+		$this->Form->input('Address.primary.1');
+		$this->assertEqual('Address.primary', $this->Form->fields[0]);
+	}
+
 /**
  * testFormSecurityMultipleInputDisabledFields method
  *