Ticket #21504: 21504.diff

wp-includes/wp-db.php

@@ -521 +521 @@
          * @since 3.1.0
          */
         function init_charset() {
-                if ( function_exists('is_multisite') && is_multisite() ) {
+                if ( is_multisite() ) {
                         $this->charset = 'utf8';
                         if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
                                 $this->collate = DB_COLLATE;
@@ -550 +550 @@
                 if ( !isset($collate) )
                         $collate = $this->collate;
                 if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) {
-                        if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset', $dbh ) ) {
+                        if ( $this->has_cap( 'set_charset', $dbh ) ) {
                                 mysql_set_charset( $charset, $dbh );
                                 $this->real_escape = true;
                         } else {
@@ -902 +902 @@
                         $args = $args[0];
                 $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
                 $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-                $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware               
+                $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware
                 $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
                 array_walk( $args, array( &$this, 'escape_by_ref' ) );
                 return @vsprintf( $query, $args );
@@ -934 +934 @@
                 else
                         $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
 
-                if ( function_exists( 'error_log' )
-                        && ( $log_file = @ini_get( 'error_log' ) )
-                        && ( 'syslog' == $log_file || @is_writable( $log_file ) )
-                        )
+                $log_file = @ini_get( 'error_log' );
+                if ( 'syslog' == $log_file || @is_writable( $log_file ) )
                         @error_log( $error_str );
 
                 // Are we showing errors?
@@ -1518 +1516 @@
          */
         function bail( $message, $error_code = '500' ) {
                 if ( !$this->show_errors ) {
-                        if ( class_exists( 'WP_Error' ) )
-                                $this->error = new WP_Error($error_code, $message);
-                        else
-                                $this->error = $message;
+                        $this->error = new WP_Error($error_code, $message);
                         return false;
                 }
                 wp_die($message);