Fix _get_operator() for 'LIKE expr ESCAPE'
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index ea56d38..02c64f9 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1167,9 +1167,8 @@
if (empty($_operators))
{
$_les = ($this->_like_escape_str !== '')
- ? preg_quote(trim(sprintf($this->_like_escape_str, $this->_like_escape_chr)))
+ ? '\s+'.preg_quote(trim(sprintf($this->_like_escape_str, $this->_like_escape_chr)))
: '';
-
$_operators = array(
'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
'\s*<>?\s*', // <, <>
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 139f467..9c6cb7e 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2050,8 +2050,6 @@
{
if (count($this->$qb_key) > 0)
{
- $sql = ($qb_key === 'qb_having') ? "\nHAVING " : "\nWHERE ";
-
for ($i = 0, $c = count($this->$qb_key); $i < $c; $i++)
{
if ($this->{$qb_key}[$i]['escape'] === FALSE)
@@ -2081,7 +2079,8 @@
.' '.trim($matches[4]).$matches[5].$matches[6];
}
- return implode("\n", $this->$qb_key);
+ return ($qb_key === 'qb_having' ? "\nHAVING " : "\nWHERE ")
+ .implode("\n", $this->$qb_key);
}
return '';