From 80238b81d6fe1921f67cced775dcf0cb610ada19 Mon Sep 17 00:00:00 2001 From: "Michael Adams (mdawaffe)" Date: Thu, 7 May 2015 01:10:05 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@32440 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/upgrade.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 1e9dda5b9e..a8b4c740a5 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/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();