*** empty log message ***

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

diff --git a/includes/db/connect_db.inc b/includes/db/connect_db.inc
index 181651ffdeed9f9169deb37deea7da0384c78c22..d6b6e71ab04f83a35c554b08a2d146de6618997c 100644 (file)
--- a/includes/db/connect_db.inc
+++ b/includes/db/connect_db.inc
@@ -9,7 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-set_global_connection();
 
 function set_global_connection()
 {
@@ -27,8 +26,8 @@ $db_duplicate_error_code = 1062;
 
 function db_query($sql, $err_msg=null)
 {
-       global $db, $show_sql, $sql_trail, $select_trail;
-
+       global $db, $show_sql, $sql_trail, $select_trail, $go_debug;
+       
        //echo "<br>$sql<br>";
        if ($show_sql)
        {
@@ -50,12 +49,13 @@ function db_query($sql, $err_msg=null)
                }
        }
 
-       if ($err_msg != null)
-         if (function_exists('xdebug_call_file'))
-               check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql);
-         else
-               check_db_error($err_msg, $sql);
-
+       if ($err_msg != null || $go_debug) {
+               $exit = $err_msg != null;
+               if (function_exists('xdebug_call_file'))
+                       check_db_error('<br>At file '.xdebug_call_file().':'.xdebug_call_line().':<br>'.$err_msg, $sql, $exit);
+               else
+                       check_db_error($err_msg, $sql, $exit);
+       }
        return $result;
 }
 
@@ -100,7 +100,8 @@ function db_num_fields ($result)
 
 function db_escape($value = "", $nullify = false)
 {
-       $value = @htmlspecialchars($value, ENT_COMPAT, $_SESSION['language']->encoding);
+       $value = @html_entity_decode($value, ENT_QUOTES, $_SESSION['language']->encoding);
+       $value = @htmlspecialchars($value, ENT_QUOTES, $_SESSION['language']->encoding);
 
        //reset default if second parameter is skipped
        $nullify = ($nullify === null) ? (false) : ($nullify);