From 493a689b1eddc2d8db2078e487596322ce86dfc2 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Tue, 7 Jan 2003 14:45:12 +0000 Subject: We'll try and get it right this time ... git-svn-id: file:///svn/phpbb/trunk@3265 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/db/mssql.php | 9 ++------- phpBB/db/mysql.php | 5 +++++ phpBB/db/mysql4.php | 5 ----- 3 files changed, 7 insertions(+), 12 deletions(-) (limited to 'phpBB/db') diff --git a/phpBB/db/mssql.php b/phpBB/db/mssql.php index 6cf118b22a..c54067f822 100644 --- a/phpBB/db/mssql.php +++ b/phpBB/db/mssql.php @@ -403,14 +403,9 @@ class sql_db return ( $query_id ) ? mssql_free_result($query_id) : false; } - function sql_quote($sql) + function sql_escape($msg) { - return str_replace("\'", "''", $sql); - } - - function sql_escape($sql) - { - return str_replace("'", "''", str_replace('\\', '\\\\', $sql)); + return str_replace("'", "''", str_replace('\\', '\\\\', $msg)); } function sql_error($query_id = 0) diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php index 132b64f79f..256a7361ad 100644 --- a/phpBB/db/mysql.php +++ b/phpBB/db/mysql.php @@ -379,6 +379,11 @@ class sql_db return ( $query_id ) ? @mysql_free_result($query_id) : false; } + function sql_escape($msg) + { + return mysql_escape_string($msg); + } + function sql_error($sql = '') { if ( !$this->return_on_error ) diff --git a/phpBB/db/mysql4.php b/phpBB/db/mysql4.php index d6f00ed1d6..1c75cf7139 100644 --- a/phpBB/db/mysql4.php +++ b/phpBB/db/mysql4.php @@ -379,11 +379,6 @@ if (!empty($_REQUEST['explain'])) return ( $query_id ) ? @mysql_free_result($query_id) : false; } - function sql_quote($msg) - { - return mysql_escape_string($msg); - } - function sql_escape($msg) { return mysql_escape_string($msg); -- cgit v1.2.1