Merge pull request #76 from mvdriel/master

slywalker · slywalker · commit ea4144cc4edd · 2013-09-04T20:36:47.000-07:00
Fixed input generation for CakePHP 2.4
diff --git a/View/Helper/BootstrapFormHelper.php b/View/Helper/BootstrapFormHelper.php
@@ -35,7 +35,7 @@ public function uneditable($fieldName, $options = array(), $before = false) {
 			}
 			return $options;
 		} else {
-			return $this->Html->tag('span', $options['value'], $options['class']);
+			return $this->Html->tag('span', $options['value'], $options);
 		}
 	}
 
@@ -247,7 +247,7 @@ public function input($fieldName, $options = array()) {
 		$input = $hidden . ((false === $div) ? $input : $this->Html->div($divControls, $input));
 
 		$out = $before . $label . $between . $input;
-		return (false === $div) ? $out : $this->Html->tag('div', $out, $div);
+		return (false === $div) ? $out : $this->Html->tag('div', $out, array('class' => $div));
 	}
 
 	protected function _getType($fieldName, $options) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function uneditable($fieldName, $options = array(), $before = false) {`
`35`	`35`	`}`
`36`	`36`	`return $options;`
`37`	`37`	`} else {`
`38`		`- return $this->Html->tag('span', $options['value'], $options['class']);`
	`38`	`+ return $this->Html->tag('span', $options['value'], $options);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`@@ -247,7 +247,7 @@ public function input($fieldName, $options = array()) {`
`247`	`247`	`$input = $hidden . ((false === $div) ? $input : $this->Html->div($divControls, $input));`
`248`	`248`
`249`	`249`	`$out = $before . $label . $between . $input;`
`250`		`- return (false === $div) ? $out : $this->Html->tag('div', $out, $div);`
	`250`	`+ return (false === $div) ? $out : $this->Html->tag('div', $out, array('class' => $div));`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`protected function _getType($fieldName, $options) {`