summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-06-29 10:43:32 +0200
committerAndrey Andreev <narf@devilix.net>2015-06-29 10:43:32 +0200
commit7ed93be5325e1622c33ea60bf5f8fc7c42ad8938 (patch)
treebf5b5921a56fb6720d8612d5f1725f1eccf25aa7 /system
parent2fb2e93d4f5fc4094a2609b870db0fe13006c8b7 (diff)
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index d89c7ba8c..859f9f564 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