Ticket #36649: 36649.diff

src/wp-includes/wp-db.php

@@ -780 +780 @@
                         if ( $this->use_mysqli ) {
                                 if ( function_exists( 'mysqli_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
                                         mysqli_set_charset( $dbh, $charset );
-                                } else {
-                                        $query = $this->prepare( 'SET NAMES %s', $charset );
-                                        if ( ! empty( $collate ) )
-                                                $query .= $this->prepare( ' COLLATE %s', $collate );
-                                        mysqli_query( $dbh, $query );
                                 }
+                                $query = $this->prepare( 'SET NAMES %s', $charset );
+                                if ( ! empty( $collate ) )
+                                        $query .= $this->prepare( ' COLLATE %s', $collate );
+                                mysqli_query( $dbh, $query );
                         } else {
                                 if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
                                         mysql_set_charset( $charset, $dbh );
-                                } else {
-                                        $query = $this->prepare( 'SET NAMES %s', $charset );
-                                        if ( ! empty( $collate ) )
-                                                $query .= $this->prepare( ' COLLATE %s', $collate );
-                                        mysql_query( $query, $dbh );
                                 }
+                                $query = $this->prepare( 'SET NAMES %s', $charset );
+                                if ( ! empty( $collate ) )
+                                        $query .= $this->prepare( ' COLLATE %s', $collate );
+                                mysql_query( $query, $dbh );
                         }
                 }
         }