summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_export.php6
-rw-r--r--system/database/DB_utility.php5
-rw-r--r--system/database/drivers/mysql/mysql_driver.php8
-rw-r--r--system/database/drivers/mysqli/mysqli_driver.php9
4 files changed, 7 insertions, 21 deletions
diff --git a/system/database/DB_export.php b/system/database/DB_export.php
index a2e3e3e4c..1704f0dfd 100644
--- a/system/database/DB_export.php
+++ b/system/database/DB_export.php
@@ -13,12 +13,6 @@
* @filesource
*/
-
-// INITIALIZE THE CLASS ---------------------------------------------------
-
-$obj =& get_instance();
-$obj->init_class('CI_DB_export', 'dbexport');
-
// ------------------------------------------------------------------------
/**
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index a2469d059..764f10cb7 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -12,11 +12,6 @@
* @since Version 1.0
* @filesource
*/
-
-// INITIALIZE THE CLASS ---------------------------------------------------
-
-$obj =& get_instance();
-$obj->init_class('CI_DB_utility', 'dbutility');
// ------------------------------------------------------------------------
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);
}
// --------------------------------------------------------------------