X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=classes%2Fdb%2Fpgsql.php;h=0cb737978aef800c0b622becb29b561e87f65171;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=0f38fb8cb5d124fd47cbcee815d89a4e6cf98d05;hpb=404e2e3603c852a3f82a21c14b8888005e2b3f99;p=tt-rss.git

diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index 0f38fb8c..0cb73797 100644
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -31,17 +31,16 @@ class Db_Pgsql implements IDb {
 	function escape_string($s, $strip_tags = true) {
 		if ($strip_tags) $s = strip_tags($s);
 
-		return pg_escape_string($this->link, $s);
+		return pg_escape_string( $s);
 	}
 
 	function query($query, $die_on_error = true) {
-		$result = pg_query($this->link, $query);
+		$result = pg_query( $query);
 
 		if (!$result) {
 			$query = htmlspecialchars($query); // just in case
-			if ($die_on_error) {
-				die("Query <i>$query</i> failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection"));
-			}
+			user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"),
+				$die_on_error ? E_USER_ERROR : E_USER_WARNING);
 		}
 		return $result;
 	}