From d33972bed776a8e95d1e5602534898672eb56cae Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 13 Feb 2008 04:16:27 +0000 Subject: changed escape_str() in mysqli_driver() to use is_object() instead of is_resource() to test $this->conn_id --- system/database/drivers/mysqli/mysqli_driver.php | 2 +- user_guide/changelog.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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
  • Fixed a bug (#3396) where certain POST variables would cause a PHP warning.
  • Fixed a bug in query binding (#3402).
  • Changed order of SQL keywords in the Profiler $highlight array so OR would not be highlighted before ORDER BY
    • +
  • Fixed a bug (#3404) where the MySQLi driver was testing if $this->conn_id was a resource instead of an object.
  • Fixed a bug (#3445) where the routed segment array was not re-indexed to begin with 1 when the default controller is used.
  • Fixed assorted user guide typos.
    • -- cgit v1.2.3-24-g4f1b