diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-09-01 12:51:26 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-09-01 12:51:26 +0200 |
| commit | 554b452845e9ec26e1cd348fda607cf00d2a5026 (patch) | |
| tree | 5f04c79bbca3037282796d6f9e0209195f511989 /system/database | |
| parent | 20573bd472bdeaa831074e563f239585554ffaf5 (diff) | |
Fix #4093
Diffstat (limited to 'system/database')
| -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 7f3334763..cf1100d27 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2342,7 +2342,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { // 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 |