Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.34
diff -u -p -F^f -r1.34 database.mysql.inc
--- includes/database.mysql.inc	11 Aug 2005 13:51:07 -0000	1.34
+++ includes/database.mysql.inc	23 Aug 2005 01:22:11 -0000
@@ -263,10 +263,17 @@ function db_decode_blob($data) {
 }
 
 /**
- * Prepare user input for use in a database query, preventing SQL injection attacks.
+ * Prepare user input for use in a database query, preventing
+ * SQL injection attacks.
  */
 function db_escape_string($text) {
-  return addslashes($text);
+  global $active_db;
+  if (isset($active_db) && is_resource($active_db)) {
+    return mysql_real_escape_string($text);
+  } else {
+    // Fallback if no connection is established yet.
+    return addslashes($text);
+  }
 }
 
 /**