Merge pull request #89 from alsvartr/auth_radius

[tt-rss.git] / include / db.php

diff --git a/include/db.php b/include/db.php
index 4e821105aff4715d6637665966983505942aa85f..a70a1d87889ad4528141e966e4aee5711c2431b0 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -15,7 +15,7 @@ function db_connect($host, $user, $pass, $db) {
                        $string .= " host=$host";
                }
 
-               if (defined('DB_PORT')) {
+               if (defined('DB_PORT') && DB_PORT) {
                        $string = "$string port=" . DB_PORT;
                }
 
@@ -41,23 +41,17 @@ function db_connect($host, $user, $pass, $db) {
        }
 }
 
-function db_escape_string($s, $strip_tags = true) {
+function db_escape_string($link, $s, $strip_tags = true) {
        if ($strip_tags) $s = strip_tags($s);
 
        if (DB_TYPE == "pgsql") {
-               return pg_escape_string($s);
+               return pg_escape_string($link, $s);
        } else {
-               return mysql_real_escape_string($s);
+               return mysql_real_escape_string($s, $link);
        }
 }
 
 function db_query($link, $query, $die_on_error = true) {
-       if ($_REQUEST["qlog"] || defined('QUERY_LOG')) {
-               $query = trim($query);
-               error_log($_SESSION["uid"] . ":" . $_REQUEST["op"] . "/" . $_REQUEST["method"] .
-                               " $query\n", 3, "/tmp/ttrss-query.log");
-       }
-
        if (DB_TYPE == "pgsql") {
                $result = pg_query($link, $query);
                if (!$result) {