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

Updates: Avoid stomping global `$wp_version` in `wp_version_check()` and related. 

fixes #34868.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2015-12-06 17:39:27 +00:00
parent 82ade1db66
commit 45032198e3
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/update.php
View File

@ -26,7 +26,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
return;
}
global $wp_version, $wpdb, $wp_local_package;
global $wpdb, $wp_local_package;
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
$php_version = phpversion();
@ -192,7 +192,6 @@ function wp_update_plugins( $extra_stats = array() ) {
return;
}
global $wp_version;
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
@ -348,7 +347,7 @@ function wp_update_themes( $extra_stats = array() ) {
if ( wp_installing() ) {
return;
}
global $wp_version;
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
@ -586,8 +585,8 @@ function wp_get_update_data() {
* @global string $wp_version
*/
function _maybe_update_core() {
global $wp_version;
include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
// include an unmodified $wp_version
include( ABSPATH . WPINC . '/version.php' );
$current = get_site_transient( 'update_core' );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-35778';
$wp_version = '4.5-alpha-35779';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.