WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade: Use correct commit no. to trigger upgrade 

Props iandunn.
See [40607], #40702.

Built from https://develop.svn.wordpress.org/trunk@40773


git-svn-id: http://core.svn.wordpress.org/trunk@40631 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2017-05-17 22:03:46 +00:00
parent 764d8b521f
commit 71adf97a35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 );

4
wp-includes/version.php
View File

@ -4,14 +4,14 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-beta1-40772';
$wp_version = '4.8-beta1-40773';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
*
* @global int $wp_db_version
*/
$wp_db_version = 38590;
$wp_db_version = 40607;
/**
* Holds the TinyMCE version