diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-12-01 12:56:16 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-12-01 12:56:16 +0100 |
| commit | 10776ccb00c5216a12b8cfae09434924cfa77f78 (patch) | |
| tree | cfbb6d68e6aac7d469b090e656579bafb58d0649 /system | |
| parent | 20862e72592a3afae3c313ed207f9e2e24870e17 (diff) | |
Fix #3380
Diffstat (limited to 'system')
| -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 c7326cd35..b011d5b5a 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( - '/(\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 |