Changeset 31354

Timestamp:

02/06/2015 05:58:15 AM (10 years ago)

Author:

pento

Message:

Upgrades: When upgrading a table to utf8mb4, we should run the ALTER TABLE query, even if it doesn't have any text columns. This will update the table's default character set, so that any text columns added in the future will have the expected character set.

See #21212

File:

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

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

@@ -1663 +1663 @@
     }
 
-    $has_utf8 = false;
     foreach ( $results as $column ) {
         if ( $column->Collation ) {
             list( $charset ) = explode( '_', $column->Collation );
             $charset = strtolower( $charset );
-            if ( 'utf8' === $charset ) {
-                $has_utf8 = true;
-            } elseif ( 'utf8mb4' !== $charset ) {
+            if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
                 // Don't upgrade tables that have non-utf8 columns.
                 return false;
             }
         }
-    }
-
-    if ( ! $has_utf8 ) {
-        // Don't bother upgrading tables that don't have utf8 columns.
-        return false;
     }