diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-06-29 10:26:01 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-06-29 10:26:01 +0200 |
| commit | 59d1ffd927ef3b63dbadf42e1caf14957201fd2d (patch) | |
| tree | 1d4ba872c91c391a548f054ffba5cc11aa8e5900 /system/database/DB_query_builder.php | |
| parent | 105749b1bd60a591398168dc8da2a8a894a296b4 (diff) | |
Fix #3932
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 8251f4558..d89c7ba8c 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -2326,7 +2326,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 |