Merge pull request #1 from gothfox/master

Update from original

1 files changed, 5 insertions, 2 deletions

diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 4d860790b..ba37f83a6 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -35,11 +35,14 @@ class Db_Pgsql implements IDb {
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = pg_query($query);
+		$result = @pg_query($this->link, $query);
 
 		if (!$result) {
+			$error = @pg_last_error($this->link);
+
+			@pg_query($this->link, "ROLLBACK");
 			$query = htmlspecialchars($query); // just in case
-			user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"),
+			user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
 				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;