Refactoring code to make it possible to nest a input inside a label

cakephp · Mar 7, 2014 · e5316ab · e5316ab
1 parent dfc7487
commit e5316ab
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -841,12 +841,6 @@ public function input($fieldName, $options = []) {
 		$this->templates($options['templates']);
 		unset($options['templates']);
 
-		$label = $this->_getLabel($fieldName, $options);
-
-		if ($options['type'] !== 'radio') {
-			unset($options['label']);
-		}
-
 		$template = 'groupContainer';
 		$error = null;
 		if ($options['type'] !== 'hidden' && $options['error'] !== false) {
@@ -855,8 +849,15 @@ public function input($fieldName, $options = []) {
 			unset($options['error']);
 		}
 
-		$groupTemplate = $options['type'] === 'checkbox' ? 'checkboxFormGroup' : 'formGroup';
+		$label = $options['label'];
+		if ($options['type'] !== 'radio') {
+			unset($options['label']);
+		}
+
 		$input = $this->_getInput($fieldName, $options);
+		$label = $this->_getLabel($fieldName, compact('input', 'label') + $options);
+
+		$groupTemplate = $options['type'] === 'checkbox' ? 'checkboxFormGroup' : 'formGroup';
 		$result = $this->formatTemplate($groupTemplate, compact('input', 'label'));
 
 		if ($options['type'] !== 'hidden') {