RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

fixed fatal bug in sql explode

Browse source
This commit is contained in:
zYne 2007-08-01 23:25:24 +00:00
parent ebfc0971c6
commit f81c5c3b39
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Doctrine/Tokenizer.php
View file

@ -191,11 +191,12 @@ class Doctrine_Tokenizer
$str = preg_split('/(' . implode('|', $d) . ')/', $str); $str = preg_split('/(' . implode('|', $d) . ')/', $str);
$d = stripslashes($d[0]); $d = stripslashes($d[0]);
} else { } else {
$str = explode("$d",$str); $str = explode($d, $str);
} }
$i = 0; $i = 0;
$term = array(); $term = array();
foreach ($str as $key => $val) { foreach ($str as $key => $val) {
if (empty($term[$i])) { if (empty($term[$i])) {
$term[$i] = trim($val); $term[$i] = trim($val);
@ -203,11 +204,11 @@ class Doctrine_Tokenizer
$s1 = substr_count($term[$i], $e1); $s1 = substr_count($term[$i], $e1);
$s2 = substr_count($term[$i], $e2); $s2 = substr_count($term[$i], $e2);
if (substr($term[$i],0,1) == '(') { if (strpos($term[$i], '(') !== false) {
if($s1 == $s2) { if($s1 == $s2) {
$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++;
@ -218,13 +219,13 @@ 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 (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++;
} }
} }