summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-02-13 05:16:27 +0100
committerDerek Jones <derek.jones@ellislab.com>2008-02-13 05:16:27 +0100
commitd33972bed776a8e95d1e5602534898672eb56cae (patch)
tree0d15d11666b47f06c503807dcdb79e2d81156057 /system
parent47d3de2ce356eefac2ecb64eb8c391680fc479e3 (diff)
changed escape_str() in mysqli_driver() to use is_object() instead of is_resource() to test $this->conn_id
Diffstat (limited to 'system')
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php2
1 files changed, 1 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);
}