Cleanup and preparing for XLS extension in class.mail.inc.

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

diff --git a/includes/db/connect_db_mysql.inc b/includes/db/connect_db_mysql.inc
index 2f30aef0fa75ec24a3891b70fcb70477231cc553..2606721443d7db758930482dcde01d80d403efb3 100644 (file)
--- a/includes/db/connect_db_mysql.inc
+++ b/includes/db/connect_db_mysql.inc
@@ -42,7 +42,7 @@ function set_global_connection($company=-1)
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $SysPres, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
+       global $db, $SysPrefs, $sql_queries, $Ajax, $db_connections, $db_last_inserted_id;
 
        // set current db prefix
        $comp = isset($_SESSION["wa_current_user"]->cur_con) ? $_SESSION["wa_current_user"]->cur_con : 0;
@@ -124,7 +124,7 @@ function db_num_fields ($result)
 function db_escape($value = "", $nullify = false)
 {
        $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);
@@ -183,8 +183,7 @@ function db_create_db($connection)
 {
        $db = mysql_connect($connection["host"] ,
                $connection["dbuser"], $connection["dbpassword"]);
-       if (strncmp(db_get_version(), "5.6", 3) >= 0) 
-               db_query("SET sql_mode = ''");
+
        if (!mysql_select_db($connection["dbname"], $db))
        {
                $sql = "CREATE DATABASE IF NOT EXISTS " . $connection["dbname"] . "";