WordPress.org

Make WordPress Core

Ticket #34224: 34224-2.patch

File 34224-2.patch, 1.2 KB (added by dboulet, 6 years ago)
  • src/wp-admin/includes/upgrade.php

    diff --git src/wp-admin/includes/upgrade.php src/wp-admin/includes/upgrade.php
    index cb53d2f..c96ad42 100644
    function pre_schema_upgrade() { 
    26302630        }
    26312631
    26322632        // Upgrade versions prior to 4.4.
    2633         if ( $wp_current_db_version < 34370 ) {
    2634                 // If compatible termmeta table is found, use it, but enforce a proper index.
     2633        if ( $wp_current_db_version < 34976 ) {
     2634                // If compatible termmeta table is found, use it, but enforce a proper index and update collation.
    26352635                if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->termmeta}'" ) && $wpdb->get_results( "SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'" ) ) {
    26362636                        $wpdb->query( "ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
     2637                        maybe_convert_table_to_utf8mb4( $wpdb->termmeta );
    26372638                }
    26382639        }
    26392640}
  • src/wp-includes/version.php

    diff --git src/wp-includes/version.php src/wp-includes/version.php
    index f245e1f..cafa299 100644
    $wp_version = '4.4-alpha-33636-src'; 
    1111 *
    1212 * @global int $wp_db_version
    1313 */
    14 $wp_db_version = 34903;
     14$wp_db_version = 34976;
    1515
    1616/**
    1717 * Holds the TinyMCE version