Skip to content

D
doctrine-dbal
Commit 34c898da authored by zYne's avatar zYne
Browse files
Options

--no commit message 

--no commit message
parent a12e74d8
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 25 deletions
lib/Doctrine/Tokenizer.php
View file @ 34c898da
...@@ -292,34 +292,21 @@ class Doctrine_Tokenizer ...@@ -292,34 +292,21 @@ class Doctrine_Tokenizer
} }
if (empty($term[$i])) { if (empty($term[$i])) {
$term[$i] = trim($val); $term[$i] = trim($val);
$s1 = substr_count($term[$i], $e1);
$s2 = substr_count($term[$i], $e2);
if (strpos($term[$i], '(') !== false) {
if($s1 == $s2) {
$i++;
}
} else {
if ( ! (substr_count($term[$i], "'") & 1) &&
! (substr_count($term[$i], "\"") & 1)) {
$i++;
}
}
} else { } else {
$term[$i] .= $str[($key + 1)] . trim($val); $term[$i] .= $str[($key + 1)] . trim($val);
$c1 = substr_count($term[$i], $e1); }
$c2 = substr_count($term[$i], $e2);
$c1 = substr_count($term[$i], $e1);
$c2 = substr_count($term[$i], $e2);
if (strpos($term[$i], '(') !== false) { if (strpos($term[$i], '(') !== false) {
if($c1 == $c2) { if($c1 == $c2) {
$i++; $i++;
} }
} else { } else {
if ( ! (substr_count($term[$i], "'") & 1) && if ( ! (substr_count($term[$i], "'") & 1) &&
! (substr_count($term[$i], "\"") & 1)) { ! (substr_count($term[$i], "\"") & 1)) {
$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