diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 8211b0844c..81c35ee5df 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -77,7 +77,10 @@ class wpdb {
 	//	Format a string correctly for safe insert under all PHP conditions
 	
 	function escape($str) {
-		return addslashes($str);				
+		if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' )
+			return mysql_escape_string( $string );
+		else
+			return mysql_real_escape_string( $string, $this->dbh );
 	}
 
 	// ==================================================================