diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2008-02-13 05:16:27 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2008-02-13 05:16:27 +0100 |
| commit | d33972bed776a8e95d1e5602534898672eb56cae (patch) | |
| tree | 0d15d11666b47f06c503807dcdb79e2d81156057 | |
| parent | 47d3de2ce356eefac2ecb64eb8c391680fc479e3 (diff) | |
changed escape_str() in mysqli_driver() to use is_object() instead of is_resource() to test $this->conn_id
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 2 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index dab56c7e7..aaeab5765 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -249,7 +249,7 @@ class CI_DB_mysqli_driver extends CI_DB { */
function escape_str($str)
{
- if (function_exists('mysqli_real_escape_string') AND is_resource($this->conn_id))
+ if (function_exists('mysqli_real_escape_string') AND is_object($this->conn_id))
{
return mysqli_real_escape_string($this->conn_id, $str);
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 5733fd8d7..43fac7e72 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -93,6 +93,7 @@ Change Log <li>Fixed a bug (#3396) where certain POST variables would cause a PHP warning.</li>
<li>Fixed a bug in query binding (#3402).</li>
<li>Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY</li>
+ <li>Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.</li>
<li>Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.</li>
<li>Fixed assorted user guide typos.</li>
</ul>
|