summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-06-10 14:08:59 +0200
committerAndrey Andreev <narf@bofh.bg>2012-06-10 14:08:59 +0200
commit392b6ad264f045a5b9c19d51d09cb9f5a8675e8a (patch)
tree42907c8bee046992e1b95246877d4ef597ddb27d /system
parentd454f0e413ba6df6494b6c0da4d32fac8a17de1c (diff)
Fix _where() with multiple condition custom query
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_query_builder.php2
-rw-r--r--system/database/drivers/postgre/postgre_driver.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 7a54fce48..65e2fa749 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -427,7 +427,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0) ? '' : $type;
$k = $this->_has_operator($k)
- ? $this->protect_identifiers(substr($k, 0, strrpos(rtrim($k), ' ')), FALSE, $escape).strrchr(rtrim($k), ' ')
+ ? $this->protect_identifiers(substr($k, 0, strpos(rtrim($k), ' ')), FALSE, $escape).strchr(rtrim($k), ' ')
: $this->protect_identifiers($k, FALSE, $escape);
if (is_null($v) && ! $this->_has_operator($k))
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 9cce1a403..ad9ac9000 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -616,7 +616,7 @@ class CI_DB_postgre_driver extends CI_DB {
$prefix = (count($this->qb_where) === 0 && count($this->qb_cache_where) === 0) ? '' : $type;
$k = $this->_has_operator($k)
- ? $this->protect_identifiers(substr($k, 0, strrpos(rtrim($k), ' ')), FALSE, $escape).strrchr(rtrim($k), ' ')
+ ? $this->protect_identifiers(substr($k, 0, strpos(rtrim($k), ' ')), FALSE, $escape).strchr(rtrim($k), ' ')
: $this->protect_identifiers($k, FALSE, $escape);
if (is_null($v) && ! $this->_has_operator($k))