summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mysqli
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-06-19 14:25:40 +0200
committerAndrey Andreev <narf@devilix.net>2014-06-19 14:25:40 +0200
commit62fad288482a02573d7c2f3463d97c7a0edbd533 (patch)
treeabd3b3f069867ee080fce1a2a29b250262b49706 /system/database/drivers/mysqli
parentcfbc6f7d3e2bf886c13ccbe5ef876f4cf9c0f259 (diff)
Fix #3112
Diffstat (limited to 'system/database/drivers/mysqli')
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index 09277fc39..aa4c6b559 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -307,9 +307,7 @@ class CI_DB_mysqli_driver extends CI_DB {
*/
protected function _escape_str($str)
{
- return is_object($this->conn_id)
- ? $this->conn_id->real_escape_string($str)
- : addslashes($str);
+ return $this->conn_id->real_escape_string($str);
}
// --------------------------------------------------------------------