diff options
Diffstat (limited to 'system/database/drivers')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 8 | ||||
| -rw-r--r-- | system/database/drivers/mysqli/mysqli_driver.php | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index d4f322d5f..792e023a8 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -227,9 +227,13 @@ class CI_DB_mysql_driver extends CI_DB { return $str; } - if (function_exists('mysql_escape_string')) + if (function_exists('mysql_real_escape_string')) { - return mysql_real_escape_string($str); + return mysql_real_escape_string($str, $this->conn_id); + } + elseif (function_exists('mysql_escape_string')) + { + return mysql_escape_string($str); } else { diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php index 63df0fe6f..b158cfefe 100644 --- a/system/database/drivers/mysqli/mysqli_driver.php +++ b/system/database/drivers/mysqli/mysqli_driver.php @@ -230,14 +230,7 @@ class CI_DB_mysqli_driver extends CI_DB { return $str; } - if (function_exists('mysql_escape_string')) - { - return mysqli_real_escape_string($this->conn_id, $str); - } - else - { - return addslashes($str); - } + return mysqli_real_escape_string($this->conn_id, $str); } // -------------------------------------------------------------------- |