Vlrsnup according to Apmuthu's list.

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

diff --git a/includes/db/connect_db_mysqli.inc b/includes/db/connect_db_mysqli.inc
index 79e299e4e6ad9dd6e302e1cd0cca5964b6a24e81..7359a85c6f731bd0629764361ea3eca42ff87fca 100644 (file)
--- a/includes/db/connect_db_mysqli.inc
+++ b/includes/db/connect_db_mysqli.inc
@@ -127,7 +127,7 @@ function db_escape($value = "", $nullify = false)
        global $db;
        
        $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
-       $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
+       $value = html_specials_encode($value);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);
@@ -182,11 +182,10 @@ function db_field_name($result, $n)
 function db_create_db($connection)
 {
        $db = mysqli_connect($connection["host"], $connection["dbuser"], $connection["dbpassword"]);
-       if (strncmp(db_get_version(), "5.6", 3) >= 0) 
-               db_query("SET sql_mode = ''");
+
        if (!mysqli_select_db($db, $connection["dbname"]))
        {
-               $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";
+               $sql = "CREATE DATABASE IF NOT EXISTS `" . $connection["dbname"] . "`";
                if (!mysqli_query($db, $sql) || !mysqli_select_db($db, $connection["dbname"]))
                        return 0;
        }