Merge pull request #20 from Cakephp-Italia/master

ajfranzoia · ajfranzoia · commit 89699e99327d · 2015-12-18T11:51:07.000-03:00
Fixed Regex
diff --git a/View/Helper/Bs3HtmlHelper.php b/View/Helper/Bs3HtmlHelper.php
@@ -95,7 +95,7 @@ public function icon($class, $options = array()) {
  */
 	public function getIconVendor($class) {
 		foreach ($this->_config['iconVendorPrefixes'] as $iconVendorPrefix) {
-			$regex = sprintf('/^%s-|\s%s-/', $iconVendorPrefix, $iconVendorPrefix);
+            $regex = sprintf('/^(?<!<"\')(%s[\s-]){1,}/', $iconVendorPrefix, $iconVendorPrefix);
 			if (preg_match($regex, $class)) {
 				return $iconVendorPrefix;
 			}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function icon($class, $options = array()) {`
`95`	`95`	`*/`
`96`	`96`	`public function getIconVendor($class) {`
`97`	`97`	`foreach ($this->_config['iconVendorPrefixes'] as $iconVendorPrefix) {`
`98`		`- $regex = sprintf('/^%s-\|\s%s-/', $iconVendorPrefix, $iconVendorPrefix);`
	`98`	`+ $regex = sprintf('/^(?<!<"\')(%s[\s-]){1,}/', $iconVendorPrefix, $iconVendorPrefix);`
`99`	`99`	`if (preg_match($regex, $class)) {`
`100`	`100`	`return $iconVendorPrefix;`
`101`	`101`	`}`