diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-10-05 23:04:19 +0200 |
| commit | 4a485a73d64a8bebc7625aabc5fdc361d5e7dc56 (patch) | |
| tree | cb18690c4de1c6ca008227260f9dd0cd2b9279d2 /system/database/drivers/mysql/mysql_driver.php | |
| parent | 39ec29585b7cdca7edc1a0757c913a13a2ee4f85 (diff) | |
| parent | d444d445ed0458a352ecb9ff79ffd158677ee805 (diff) | |
Merge branch 'develop' into feature/session
Diffstat (limited to 'system/database/drivers/mysql/mysql_driver.php')
| -rw-r--r-- | system/database/drivers/mysql/mysql_driver.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php index 7cbcf1028..a827a6ed4 100644 --- a/system/database/drivers/mysql/mysql_driver.php +++ b/system/database/drivers/mysql/mysql_driver.php @@ -336,9 +336,7 @@ class CI_DB_mysql_driver extends CI_DB { */ protected function _escape_str($str) { - return is_resource($this->conn_id) - ? mysql_real_escape_string($str, $this->conn_id) - : addslashes($str); + return mysql_real_escape_string($str, $this->conn_id); } // -------------------------------------------------------------------- |