update schema, more mysql work

1 files changed, 11 insertions, 3 deletions

diff --git a/db.php b/db.php
index cfb289e0c..d739aa9b2 100644
--- a/db.php
+++ b/db.php
@@ -20,7 +20,7 @@ function db_escape_string($s) {
 	if (DB_TYPE == "pgsql") {	
 		return pg_escape_string($s);
 	} else {
-		return mysql_escape_string($s);
+		return mysql_real_escape_string($s);
 	}
 }
 
@@ -32,6 +32,14 @@ function db_query($link, $query) {
 	}
 }
 
+function db_query_2($query) {
+	if (DB_TYPE == "pgsql") {
+		return pg_query($query);
+	} else if (DB_TYPE == "mysql") {
+		return mysql_query($link);
+	}
+}
+
 function db_fetch_assoc($result) {
 	if (DB_TYPE == "pgsql") {
 		return pg_fetch_assoc($result);
@@ -43,9 +51,9 @@ function db_fetch_assoc($result) {
 
 function db_num_rows($result) {
 	if (DB_TYPE == "pgsql") {
-		return pg_num_rows($link, $query);
+		return pg_num_rows($result);
 	} else if (DB_TYPE == "mysql") {
-		return mysql_num_rows($link, $query);
+		return mysql_num_rows($result);
 	}
 }