Only clear the unlocked fields on end().

Doing this work on end() allows fields to be unlocked before the form is created which can be helpful. Refs #8880
cakephp · May 25, 2016 · e78af35 · e78af35
1 parent b15560e
commit e78af35
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -1608,8 +1608,10 @@ public function testResetUnlockFields() {
 			'unlockedFields' => array()
 		);
 
-		$this->Form->create('Contact');
 		$this->Form->unlockField('Contact.id');
+		$this->Form->create('Contact');
+		$this->Form->hidden('Contact.id', array('value' => 1));
+		$this->assertEmpty($this->Form->fields, 'Field should be unlocked');
 		$this->Form->end();
 
 		$this->Form->create('Contact');

diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
@@ -467,7 +467,6 @@ public function create($model = null, $options = array()) {
 		$htmlAttributes = array_merge($options, $htmlAttributes);
 
 		$this->fields = array();
-		$this->_unlockedFields = array();
 		if ($this->requestType !== 'get') {
 			$append .= $this->_csrfField();
 		}
@@ -561,6 +560,7 @@ public function end($options = null, $secureAttributes = array()) {
 		$this->setEntity(null);
 		$out .= $this->Html->useTag('formend');
 
+		$this->_unlockedFields = array();
 		$this->_View->modelScope = false;
 		$this->requestType = null;
 		return $out;