Changeset 33063

Timestamp:

07/03/2015 12:43:48 PM (11 years ago)

Author:

dd32

Message:

Enable utf8mb4 for MySQL extension users. Previously utf8mb4 was limited to MySQLi users only unintentionally.

Ports [33055] to the 4.2 branch
Fixes #32127 for 4.2.3

Location:

branches/4.2/src

Files:

• wp-admin/includes/upgrade.php (modified) (4 diffs)
• wp-includes/version.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)

branches/4.2/src/wp-admin/includes/upgrade.php

@@ -525 +525 @@
                 upgrade_400();
 
-        // Don't harsh my mellow. upgrade_422() must be called before
-        // upgrade_420() to catch bad comments prior to any auto-expansion of
-        // MySQL column widths.
         if ( $wp_current_db_version < 31534 )
                 upgrade_422();
 
-        if ( $wp_current_db_version < 31351 )
-                upgrade_420();
+        if ( $wp_current_db_version < 31536 )
+                upgrade_423();
 
         maybe_disable_link_manager();
@@ -1427 +1424 @@
  */
 function upgrade_420() {
-        global $wp_current_db_version, $wpdb;
-
-        if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-                if ( is_multisite() ) {
-                        $tables = $wpdb->tables( 'blog' );
-                } else {
-                        $tables = $wpdb->tables( 'all' );
-                        if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-                                $global_tables = $wpdb->tables( 'global' );
-                                $tables = array_diff_assoc( $tables, $global_tables );
-                        }
-                }
-
-                foreach ( $tables as $table ) {
-                        maybe_convert_table_to_utf8mb4( $table );
-                }
-        }
 }
 
@@ -1498 +1478 @@
                 foreach ( $comments as $comment ) {
                         wp_delete_comment( $comment->comment_ID, true );
+                }
+        }
+}
+
+/**
+ * Execute changes made in WordPress 4.2.0.
+ *
+ * @since 4.2.3
+ */
+function upgrade_423() {
+        global $wp_current_db_version, $wpdb;
+
+        if ( $wp_current_db_version < 31536 && $wpdb->charset === 'utf8mb4' ) {
+                if ( is_multisite() ) {
+                        $tables = $wpdb->tables( 'blog' );
+                } else {
+                        $tables = $wpdb->tables( 'all' );
+                        if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+                                $global_tables = $wpdb->tables( 'global' );
+                                $tables = array_diff_assoc( $tables, $global_tables );
+                        }
+                }
+
+                foreach ( $tables as $table ) {
+                        maybe_convert_table_to_utf8mb4( $table );
                 }
         }
@@ -1629 +1634 @@
                         if ( $upgrade ) {
                                 $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+                        }
+                }
+        }
+
+        // 4.2.3
+        if ( $wp_current_db_version < 31536 && $wpdb->charset === 'utf8mb4' ) {
+                if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+                        $tables = $wpdb->tables( 'global' );
+
+                        foreach ( $tables as $table ) {
+                                maybe_convert_table_to_utf8mb4( $table );
                         }
                 }

branches/4.2/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 31535;
+$wp_db_version = 31536;
 
 /**

branches/4.2/src/wp-includes/wp-db.php

@@ -739 +739 @@
                 }
 
-                if ( ( $this->use_mysqli && ! ( $this->dbh instanceof mysqli ) )
-                  || ( empty( $this->dbh ) || ! ( $this->dbh instanceof mysqli ) ) ) {
+                if ( ( $this->use_mysqli && ! ( $this->dbh instanceof mysqli ) ) || empty( $this->dbh ) ) {
                         return;
                 }