Fixing form attribute access and broken test.

cakephp · May 18, 2010 · 76f94d5 · 76f94d5
1 parent ef85fb1
commit 76f94d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -615,8 +615,8 @@ public function inputs($fields = null, $blacklist = null) {
 		if ($legend === true) {
 			$actionName = __('New %s');
 			$isEdit = (
-				strpos($this->action, 'update') !== false ||
-				strpos($this->action, 'edit') !== false
+				strpos($this->request->params['action'], 'update') !== false ||
+				strpos($this->request->params['action'], 'edit') !== false
 			);
 			if ($isEdit) {
 				$actionName = __('Edit %s');

diff --git a/cake/tests/cases/libs/view/helpers/form.test.php b/cake/tests/cases/libs/view/helpers/form.test.php
@@ -2206,7 +2206,7 @@ function testFormInputs() {
 		$View = ClassRegistry::getObject('view');
 		$this->Form->create('Contact');
 		$this->Form->request['prefix'] = 'admin';
-		$this->Form->action = 'admin_edit';
+		$this->Form->request['action'] = 'admin_edit';
 		$result = $this->Form->inputs();
 		$expected = array(
 			'<fieldset',