More updates for disabledFields -> unlockedFields.

cakephp · Jun 15, 2011 · 878b854 · 878b854
1 parent c136349
commit 878b854
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/Cake/Controller/Component/SecurityComponent.php b/lib/Cake/Controller/Component/SecurityComponent.php
@@ -500,7 +500,7 @@ protected function _generateToken($controller) {
 			'key' => $authKey,
 			'allowedControllers' => $this->allowedControllers,
 			'allowedActions' => $this->allowedActions,
-			'disabledFields' => $this->disabledFields,
+			'unlockedFields' => array_merge($this->disabledFields, $this->unlockedFields),
 			'csrfTokens' => array()
 		);
 
@@ -521,7 +521,7 @@ protected function _generateToken($controller) {
 		$this->Session->write('_Token', $token);
 		$controller->request->params['_Token'] = array(
 			'key' => $token['key'],
-			'disabledFields' => $token['disabledFields']
+			'unlockedFields' => $token['unlockedFields']
 		);
 		return true;
 	}