From 33de9a144aad28763405f8ae2d5c59df5e929b4f Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Thu, 28 Sep 2006 06:50:16 +0000
Subject:

---
 system/database/drivers/mysql/mysql_driver.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'system/database/drivers/mysql/mysql_driver.php')

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
 		{
-- 
cgit v1.2.3-24-g4f1b