From 38f439708cd78b224978c3d3d9cd85d40a9f9c04 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 2 Aug 2013 16:20:39 +0400 Subject: rollback current transaction before trying to report SQL query errors, properly save database error messages when logging query errors --- classes/db/mysqli.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes/db/mysqli.php') diff --git a/classes/db/mysqli.php b/classes/db/mysqli.php index a41ebf8ec..c685b75a0 100644 --- a/classes/db/mysqli.php +++ b/classes/db/mysqli.php @@ -24,9 +24,12 @@ class Db_Mysqli implements IDb { } function query($query, $die_on_error = true) { - $result = mysqli_query($this->link, $query); + $result = @mysqli_query($this->link, $query); if (!$result) { - user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"), + $error = @mysqli_error($this->link); + + @mysqli_query($this->link, "ROLLBACK"); + user_error("Query $query failed: " . ($this->link ? $error : "No connection"), $die_on_error ? E_USER_ERROR : E_USER_WARNING); } -- cgit v1.2.3