Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 3 deletions

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