diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-12-01 23:15:42 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-12-01 23:15:42 +0100 |
| commit | ab9217e316a79bc8fab2840c8f5bd2b9bc7a4dc0 (patch) | |
| tree | 6930bd07de19cfc16e957f356ae2e0439024840a /system/database/DB_query_builder.php | |
| parent | 7d1554a3f40c3bc453aeae3b960ae7394c4174c9 (diff) | |
Improve on the fix for #3380
Diffstat (limited to 'system/database/DB_query_builder.php')
| -rw-r--r-- | system/database/DB_query_builder.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 1a6cea441..621480635 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2319,7 +2319,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // 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 |