reinstate error handlers; better DB error reporting on failed queries

[tt-rss.git] / classes / db / mysql.php

diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 64c35ebdcd1fba302337ca5996036a4731bee20a..241d2a063b42234a4b614528b5fc9c58690d4552 100644 (file)
--- a/classes/db/mysql.php
+++ b/classes/db/mysql.php
@@ -25,10 +25,8 @@ class Db_Mysql implements IDb {
        function query($query, $die_on_error = true) {
                $result = mysql_query($query, $this->link);
                if (!$result) {
-                       $query = htmlspecialchars($query);
-                       if ($die_on_error) {
-                               die("Query <i>$query</i> failed: " . ($this->link ? mysql_error($link) : "No connection"));
-                       }
+                       user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"),
+                               $die_on_error ? E_USER_ERROR : E_USER_WARNING);
                }
                return $result;
        }