Changeset 33058 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

07/03/2015 05:43:28 AM (10 years ago)

Author:

dd32

Message:

Don't upgrade global tables to utf8mb4 when wp_should_upgrade_global_tables() says not to.
Additionally fixes an incorrect conditional in [33057] which would result in the usermeta index being altered twice on Multisite updates.

See #32154

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -1515 +1515 @@
         } else {
             $tables = $wpdb->tables( 'all' );
+            if ( ! wp_should_upgrade_global_tables() ) {
+                $global_tables = $wpdb->tables( 'global' );
+                $tables = array_diff_assoc( $tables, $global_tables );
+            }
         }
     
@@ -2635 +2639 @@
     // Upgrade versions prior to 4.2.
     if ( $wp_current_db_version < 31351 ) {
-        if ( wp_should_upgrade_global_tables() ) {
+        if ( ! is_multisite() && wp_should_upgrade_global_tables() ) {
             $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
         }
@@ -2712 +2716 @@
 
     /**
-     * Filter if upgrade routines should be run on global tables in multisite.
+     * Filter if upgrade routines should be run on global tables.
      *
      * @param bool $should_upgrade Whether to run the upgrade routines on global tables.