| commit | ab9217e316a79bc8fab2840c8f5bd2b9bc7a4dc0 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Tue Dec 02 00:15:42 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Tue Dec 02 00:15:42 2014 +0200 |
| tree | 6930bd07de19cfc16e957f356ae2e0439024840a | |
| parent | 7d1554a3f40c3bc453aeae3b960ae7394c4174c9 [diff] [blame] |
Improve on the fix for #3380
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 1a6cea4..6214806 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php
@@ -2319,7 +2319,7 @@ // Split multiple conditions $conditions = preg_split( - '/(\bAND\s+|\bOR\s+)/i', + '/(?!<[\'"].*)(\s*AND\s+|\s*OR\s+)(?!.*[\'"])/i', $this->{$qb_key}[$i]['condition'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY