| commit | 554b452845e9ec26e1cd348fda607cf00d2a5026 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Tue Sep 01 13:51:26 2015 +0300 |
| committer | Andrey Andreev <narf@devilix.net> | Tue Sep 01 13:51:26 2015 +0300 |
| tree | 5f04c79bbca3037282796d6f9e0209195f511989 | |
| parent | 20573bd472bdeaa831074e563f239585554ffaf5 [diff] [blame] |
Fix #4093
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index 7f33347..cf1100d 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php
@@ -2342,7 +2342,7 @@ // Split multiple conditions $conditions = preg_split( - '/((^|\s+)AND\s+|(^|\s+)OR\s+)/i', + '/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i', $this->{$qb_key}[$i]['condition'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY