Get the legend element working again.

cakephp · Mar 4, 2014 · b959378 · b959378
1 parent a5ed2c2
commit b959378
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -769,15 +769,11 @@ public function inputs($fields = null, $blacklist = null, $options = array()) {
 		if ($legend === true) {
 			$actionName = __d('cake', 'New %s');
 			$isCreate = $context->isCreate();
-			$isEdit = (
-				strpos($this->request->params['action'], 'update') !== false ||
-				strpos($this->request->params['action'], 'edit') !== false
-			);
-			if ($isEdit) {
+			if (!$isCreate) {
 				$actionName = __d('cake', 'Edit %s');
 			}
-			$modelName = Inflector::humanize(Inflector::underscore($model));
-			$legend = sprintf($actionName, __($modelName));
+			$modelName = Inflector::humanize(Inflector::singularize($this->request->params['controller']));
+			$legend = sprintf($actionName, $modelName);
 		}
 
 		$out = null;

diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -2534,7 +2534,7 @@ public function testFormInputsLegendFieldset() {
 		$expected = [
 			'<fieldset',
 			'<legend',
-			'Edit Article',
+			'New Article',
 			'/legend',
 			'*/fieldset',
 		];