Commit 37198a6b authored by zYne's avatar zYne

formatting fix

parent d877b823
...@@ -49,7 +49,7 @@ class Doctrine_Tokenizer ...@@ -49,7 +49,7 @@ class Doctrine_Tokenizer
*/ */
public static function bracketTrim($str, $e1 = '(', $e2 = ')') public static function bracketTrim($str, $e1 = '(', $e2 = ')')
{ {
if (substr($str,0,1) == $e1 && substr($str,-1) == $e2) { if (substr($str, 0, 1) === $e1 && substr($str, -1) === $e2) {
return substr($str, 1, -1); return substr($str, 1, -1);
} else { } else {
return $str; return $str;
...@@ -81,8 +81,9 @@ class Doctrine_Tokenizer ...@@ -81,8 +81,9 @@ class Doctrine_Tokenizer
if(is_array($d)) { if(is_array($d)) {
$a = preg_split('/('.implode('|', $d).')/', $str); $a = preg_split('/('.implode('|', $d).')/', $str);
$d = stripslashes($d[0]); $d = stripslashes($d[0]);
} else } else {
$a = explode($d, $str); $a = explode($d, $str);
}
$i = 0; $i = 0;
$term = array(); $term = array();
...@@ -127,8 +128,9 @@ class Doctrine_Tokenizer ...@@ -127,8 +128,9 @@ class Doctrine_Tokenizer
if (is_array($d)) { if (is_array($d)) {
$a = preg_split('/('.implode('|', $d).')/', $str); $a = preg_split('/('.implode('|', $d).')/', $str);
$d = stripslashes($d[0]); $d = stripslashes($d[0]);
} else } else {
$a = explode($d, $str); $a = explode($d, $str);
}
$i = 0; $i = 0;
$term = array(); $term = array();
...@@ -136,13 +138,13 @@ class Doctrine_Tokenizer ...@@ -136,13 +138,13 @@ class Doctrine_Tokenizer
if (empty($term[$i])) { if (empty($term[$i])) {
$term[$i] = trim($val); $term[$i] = trim($val);
if( ! (substr_count($term[$i], "'") & 1)) { if ( ! (substr_count($term[$i], "'") & 1)) {
$i++; $i++;
} }
} else { } else {
$term[$i] .= $d . trim($val); $term[$i] .= $d . trim($val);
if( ! (substr_count($term[$i], "'") & 1)) { if ( ! (substr_count($term[$i], "'") & 1)) {
$i++; $i++;
} }
} }
...@@ -216,7 +218,7 @@ class Doctrine_Tokenizer ...@@ -216,7 +218,7 @@ class Doctrine_Tokenizer
$c1 = substr_count($term[$i], $e1); $c1 = substr_count($term[$i], $e1);
$c2 = substr_count($term[$i], $e2); $c2 = substr_count($term[$i], $e2);
if (substr($term[$i],0,1) == '(') { if (substr($term[$i], 0, 1) == '(') {
if($c1 == $c2) { if($c1 == $c2) {
$i++; $i++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment