holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(partial) backport of 33571 to fix case-sensitive like and infinite loop with OR

Browse Source
This commit is contained in:
Nathan Gray 2011-03-22 19:14:01 +00:00
parent 1e57dc6cf8
commit 052d31c168
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.so_sql.inc.php
View File

@ -1115,6 +1115,7 @@ class so_sql
} }
elseif ($token == strtoupper(lang('OR')) || $token == 'OR') elseif ($token == strtoupper(lang('OR')) || $token == 'OR')
{ {
$token = strtok($break);
continue; continue;
} }
elseif ($token == strtoupper(lang('NOT')) || $token == 'NOT') elseif ($token == strtoupper(lang('NOT')) || $token == 'NOT')
@ -1159,7 +1160,7 @@ class so_sql
$op = 'OR'; $op = 'OR';
break; break;
} }
$token_filter = " $columns LIKE " . $token_filter = " $columns " . $this->db->capabilities['case_insensitive_like'] . ' ' .
$GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard); $GLOBALS['egw']->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$token).$wildcard);
// Compare numeric token as equality for numeric columns // Compare numeric token as equality for numeric columns