db_escape_string: specify link parameter for consistency; sessions: do not force...

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

diff --git a/include/db.php b/include/db.php
index 0f4bf3708cadc8451cbbcccbb83ac0ae48845f86..0479df6a9ade71280e590160c6801321b643d39f 100644 (file)
--- a/include/db.php
+++ b/include/db.php
@@ -41,21 +41,13 @@ function db_connect($host, $user, $pass, $db) {
        }
 }
 
-function db_escape_string($s, $strip_tags = true, $link = NULL) {
+function db_escape_string($link, $s, $strip_tags = true) {
        if ($strip_tags) $s = strip_tags($s);
 
        if (DB_TYPE == "pgsql") {
-               if ($link) {
-                       return pg_escape_string($link, $s);
-               } else {
-                       return pg_escape_string($s);
-               }
+               return pg_escape_string($link, $s);
        } else {
-               if ($link) {
-                       return mysql_real_escape_string($s, $link);
-               } else {
-                       return mysql_real_escape_string($s);
-               }
+               return mysql_real_escape_string($s, $link);
        }
 }