summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-01 13:09:51 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-01 13:09:51 +0100
commit7d1554a3f40c3bc453aeae3b960ae7394c4174c9 (patch)
treeefa349d8cfb7d24de23c8e9012b476b0777895d7 /system/database
parent10776ccb00c5216a12b8cfae09434924cfa77f78 (diff)
Fix a regression from the previous commit
Diffstat (limited to 'system/database')
-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 b011d5b5a..1a6cea441 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',
+ '/(\bAND\s+|\bOR\s+)/i',
$this->{$qb_key}[$i]['condition'],
-1,
PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY