Ticket #5455: use_mysql_real_escape_string.diff

wp-includes/wp-db.php

@@ -81 +81 @@
 
                 $this->ready = true;
 
-                if ( !empty($this->charset) && version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') )
+                if ( function_exists('mysql_set_charset') ) {
+                        $this->charset = ( empty( $this->charset ) ) ? 'utf8' : $this->charset;
+                        mysql_set_charset($this->charset, $this->dbh);
+                }
+
+                elseif ( !empty($this->charset) && version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') )
                         $this->query("SET NAMES '$this->charset'");
 
                 $this->select($dbname);
@@ -138 +143 @@
          * @return string query safe string
          */
         function escape($string) {
-                return addslashes( $string );
-                // Disable rest for now, causing problems
-                /*
-                if( !$this->dbh || version_compare( phpversion(), '4.3.0' ) == '-1' )
-                        return mysql_escape_string( $string );
-                else
+                if ( 'utf8' == $this->charset ) 
                         return mysql_real_escape_string( $string, $this->dbh );
-                */
+                else 
+                        return addslashes( $string );
         }
 
         /**