From a3807c1d34a4881f8b9428b162bc3241f1a135b4 Mon Sep 17 00:00:00 2001 From: Michael Adams Date: Thu, 7 May 2015 01:11:29 +0000 Subject: [PATCH] Upgrade: Since MySQL may auto-expand column widths when changing a column's character set, we must do our length-based comment checks prior to the character set changes. Props jorbin, et alii. See #32165. Built from https://develop.svn.wordpress.org/trunk@32440 git-svn-id: http://core.svn.wordpress.org/trunk@32410 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/upgrade.php | 9 ++++++--- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 1e9dda5b9e..a8b4c740a5 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -524,12 +524,15 @@ function upgrade_all() { if ( $wp_current_db_version < 29630 ) upgrade_400(); - if ( $wp_current_db_version < 31351 ) - upgrade_420(); - + // Don't harsh my mellow. upgrade_430() must be called before + // upgrade_420() to catch bad comments prior to any auto-expansion of + // MySQL column widths. if ( $wp_current_db_version < 32364 ) upgrade_430(); + if ( $wp_current_db_version < 31351 ) + upgrade_420(); + maybe_disable_link_manager(); maybe_disable_automattic_widgets(); diff --git a/wp-includes/version.php b/wp-includes/version.php index 19bd59417d..9ecf9d9339 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32429'; +$wp_version = '4.3-alpha-32440'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.