Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / includes / db / connect_db.inc

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 75469fb9885b4e5465c364175624742743ad5c5f..3fc2bcfb437a9a7bdcb270cd511bade59bbe5de1 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -73,19 +73,12 @@ function db_num_fields ($result)
        return mysql_num_fields($result);
 }
 
-function db_escape ($result)
+function db_escape($value = "", $nullify = false)
 {
-       return mysql_escape_string($result);
-}
-
-function db_quote($value = "", $nullify = false)
-{
-       $value = htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+       $value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);
-       //undo slashes for poorly configured servers
-       $value = (get_magic_quotes_gpc()) ? (stripslashes($value)) : ($value);
 
        //check for null/unset/empty strings
        if ((!isset($value)) || (is_null($value)) || ($value === "")) {