Changeset 33059 for branches/4.2/src/wp-admin/includes/upgrade.php

Timestamp:

07/03/2015 05:58:20 AM (11 years ago)

Author:

dd32

Message:

Don't upgrade global tables to utf8mb4 when DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
This change also standardises on only checking DO_NOT_UPGRADE_GLOBAL_TABLES is defined, not it's value.

Fixes #32154 for 4.2

Location:

branches/4.2

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/upgrade.php (modified) (4 diffs)

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

@@ -1434 +1434 @@
                 } else {
                         $tables = $wpdb->tables( 'all' );
+                        if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+                                $global_tables = $wpdb->tables( 'global' );
+                                $tables = array_diff_assoc( $tables, $global_tables );
+                        }
                 }
 
@@ -1597 +1601 @@
         // 4.2
         if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-                if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
+                if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
                         $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
                         $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
@@ -1613 +1617 @@
         // 4.2.2
         if ( $wp_current_db_version < 31535 && 'utf8mb4' === $wpdb->charset ) {
-                if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
+                if ( ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
                         $upgrade = false;
                         $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
@@ -2460 +2464 @@
         // Upgrade versions prior to 4.2.
         if ( $wp_current_db_version < 31351 ) {
-                if ( ! is_multisite() ) {
+                if ( ! is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
                         $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
                 }