block mysql versions where true is undefined in sanity_check

[tt-rss.git] / db.php

diff --git a/db.php b/db.php
index 55768f3f66364909b06eb06d346a20138c863e59..7766c0563a8f27ccc2ba6284169f90961bd2a762 100644 (file)
--- a/db.php
+++ b/db.php
@@ -55,19 +55,23 @@ function db_escape_string_2($s, $link) {
        }
 }
 
-function db_query($link, $query) {
+function db_query($link, $query, $die_on_error = true) {
        if (DB_TYPE == "pgsql") {
                $result = pg_query($link, $query);
                if (!$result) {
                        $query = htmlspecialchars($query); // just in case
-                       die("Query <i>$query</i> failed: " . pg_last_error($link));                     
+                       if ($die_on_error) {
+                               die("Query <i>$query</i> failed: " . pg_last_error($link));                     
+                       }
                }
                return $result;
        } else if (DB_TYPE == "mysql") {
                $result = mysql_query($query, $link);
                if (!$result) {
                        $query = htmlspecialchars($query);
-                       die("Query <i>$query</i> failed: " . mysql_error($link));
+                       if ($die_on_error) {
+                               die("Query <i>$query</i> failed: " . mysql_error($link));
+                       }
                }
                return $result;
        }