Changeset 37320 for trunk/src/wp-includes/wp-db.php

Timestamp:

04/28/2016 01:38:31 AM (9 years ago)

Author:

ericlewis

Message:

Database: Set MySQL connection collation.

Fixes #36649.

File:

• trunk/src/wp-includes/wp-db.php (modified) (1 diff)

trunk/src/wp-includes/wp-db.php

@@ -781 +781 @@
                 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 );
             }
         }