From b54935077645cd23d80abe378dc0ccd1a127c5ba Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Wed, 17 May 2017 22:02:02 +0000 Subject: [PATCH] Upgrade: Use correct commit no. to trigger upgrade Props iandunn. See [40607], #40702. git-svn-id: https://develop.svn.wordpress.org/trunk@40773 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/upgrade.php | 4 ++-- src/wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index d4be87dfaa..23a5eee4d7 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -565,7 +565,7 @@ function upgrade_all() { if ( $wp_current_db_version < 37965 ) upgrade_460(); - if ( $wp_current_db_version < 40500 ) { //todo update to commit for #40702 + if ( $wp_current_db_version < 40607 ) { upgrade_480(); } @@ -1747,7 +1747,7 @@ function upgrade_460() { function upgrade_480() { global $wp_current_db_version; - if ( $wp_current_db_version < 40500 ) { // todo update to commit for #40702 + if ( $wp_current_db_version < 40607 ) { // This feature plugin was merged for #40702, so the plugin itself is no longer needed deactivate_plugins( array( 'nearby-wp-events/nearby-wordpress-events.php' ), true ); diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php index 020cf0cf8a..374ef078e9 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -11,7 +11,7 @@ $wp_version = '4.8-beta1-40663-src'; * * @global int $wp_db_version */ -$wp_db_version = 38590; +$wp_db_version = 40607; /** * Holds the TinyMCE version