diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 071be8272d..f88ab5166e 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -93,8 +93,8 @@ class wpdb {
 		$EZSQL_ERROR[] = 
 		array ('query' => $this->last_query, 'error_str' => $str);
 
-		$str = htmlspecialchars($str, 1);
-		$query = htmlspecialchars($this->last_query, 1);
+		$str = htmlspecialchars($str, ENT_QUOTES);
+		$query = htmlspecialchars($this->last_query, ENT_QUOTES);
 		// Is error output turned on or not..
 		if ( $this->show_errors ) {
 			// If there is an error then take note of it