From aca75cb5cb323535099c7aef46a78ea3cec082f2 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 17 Apr 2013 16:05:52 +0400
Subject: reinstate error handlers; better DB error reporting on failed queries

---
 classes/db/mysql.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'classes/db/mysql.php')

diff --git a/classes/db/mysql.php b/classes/db/mysql.php
index 64c35ebdc..241d2a063 100644
--- 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;
 	}
-- 
cgit v1.2.3