| commit | 10776ccb00c5216a12b8cfae09434924cfa77f78 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Mon Dec 01 13:56:16 2014 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Mon Dec 01 13:56:16 2014 +0200 |
| tree | cfbb6d68e6aac7d469b090e656579bafb58d0649 | |
| parent | 20862e72592a3afae3c313ed207f9e2e24870e17 [diff] |
Fix #3380
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index c7326cd..b011d5b 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php
@@ -2319,7 +2319,7 @@ // 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