sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Konstantin Obenland 2017-05-17 22:02:02 +00:00
parent 2dd4bc7388
commit b549350776
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/upgrade.php
View File

@ -565,7 +565,7 @@ function upgrade_all() {
if ( $wp_current_db_version < 37965 ) if ( $wp_current_db_version < 37965 )
upgrade_460(); upgrade_460();
if ( $wp_current_db_version < 40500 ) { //todo update to commit for #40702 if ( $wp_current_db_version < 40607 ) {
upgrade_480(); upgrade_480();
} }
@ -1747,7 +1747,7 @@ function upgrade_460() {
function upgrade_480() { function upgrade_480() {
global $wp_current_db_version; 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 // 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 ); deactivate_plugins( array( 'nearby-wp-events/nearby-wordpress-events.php' ), true );

2
src/wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '4.8-beta1-40663-src';
* *
* @global int $wp_db_version * @global int $wp_db_version
*/ */
$wp_db_version = 38590; $wp_db_version = 40607;
/** /**
* Holds the TinyMCE version * Holds the TinyMCE version