Merge pull request #179 from nottwo/$link-cleanup

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

diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php
index c9ec338876dd2e150a2e6b5ca2e18c679d9b6a50..4d860790b1d1da4306eeaf2f125c53b12b04a6c3 100644 (file)
--- a/classes/db/pgsql.php
+++ b/classes/db/pgsql.php
@@ -23,23 +23,24 @@ class Db_Pgsql implements IDb {
                        die("Unable to connect to database (as $user to $host, database $db):" . pg_last_error());
                }
 
+               $this->init();
+
                return $this->link;
        }
 
        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;
        }