Merge branch 'master' of git://github.com/slywalker/cakephp-plugin-boost_cake

slywalker · slywalker · commit 0d8139c8b0ac · 2013-10-04T17:24:27.000+09:00
diff --git a/View/Helper/BoostCakeFormHelper.php b/View/Helper/BoostCakeFormHelper.php
@@ -115,6 +115,7 @@ public function input($fieldName, $options = array()) {
 			}
 			$regex = '/(<label.*?>)(.*?<\/label>)/';
 			if (preg_match($regex, $html, $label)) {
+				$label = str_replace('$', '\$', $label);
 				$html = preg_replace($regex, '', $html);
 				$html = preg_replace(
 					'/(<input type="checkbox".*?>)/',
@@ -273,4 +274,4 @@ public function postLink($title, $url = null, $options = array(), $confirmMessag
 		return $out;
 	}
 
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ public function input($fieldName, $options = array()) {`
`115`	`115`	`}`
`116`	`116`	`$regex = '/(<label.?>)(.?<\/label>)/';`
`117`	`117`	`if (preg_match($regex, $html, $label)) {`
	`118`	`+ $label = str_replace('$', '\$', $label);`
`118`	`119`	`$html = preg_replace($regex, '', $html);`
`119`	`120`	`$html = preg_replace(`
`120`	`121`	`'/(<input type="checkbox".*?>)/',`
`@@ -273,4 +274,4 @@ public function postLink($title, $url = null, $options = array(), $confirmMessag`
`273`	`274`	`return $out;`
`274`	`275`	`}`
`275`	`276`
`276`		`-}`
	`277`	`+}`