Changeset 31351

Timestamp:

02/06/2015 05:25:22 AM (10 years ago)

Author:

pento

Message:

Upgrades: When deciding if we can upgrade a table to utf8mb4, make sure we're checking the character set, not the collation.

Bump the DB version as well, as the update in [31349] wouldn't have triggered for anyone who tried it.

See #21212

Location:

trunk/src

Files:

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

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

@@ -520 +520 @@
         upgrade_400();
 
-    if ( $wp_current_db_version < 31349 )
+    if ( $wp_current_db_version < 31351 )
         upgrade_420();
 
@@ -1418 +1418 @@
     global $wp_current_db_version, $wpdb;
 
-    if ( $wp_current_db_version < 31349 && $wpdb->charset === 'utf8mb4' ) {
+    if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
         if ( is_multisite() ) {
             $tables = $wpdb->tables( 'blog' );
@@ -1529 +1529 @@
 
     // 4.2
-    if ( $wp_current_db_version < 31349 && $wpdb->charset === 'utf8mb4' ) {
+    if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
         if ( ! ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && DO_NOT_UPGRADE_GLOBAL_TABLES ) ) {
             $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
@@ -1666 +1666 @@
     foreach ( $results as $column ) {
         if ( $column->Collation ) {
-            if ( 'utf8' === $column->Collation ) {
+            list( $charset ) = explode( '_', $column->Collation );
+            $charset = strtolower( $charset );
+            if ( 'utf8' === $charset ) {
                 $has_utf8 = true;
-            } elseif ( 'utf8mb4' !== $column->Collation ) {
+            } elseif ( 'utf8mb4' !== $charset ) {
                 // Don't upgrade tables that have non-utf8 columns.
                 return false;
@@ -2362 +2364 @@
 
     // Upgrade versions prior to 4.2.
-    if ( $wp_current_db_version < 31349 ) {
+    if ( $wp_current_db_version < 31351 ) {
         // So that we can change tables to utf8mb4, we need to shorten the index lengths to less than 767 bytes
         $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );

trunk/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 31349;
+$wp_db_version = 31351;
 
 /**