When WordPress is loaded in a function (e.g. unit tests) the variables initialized at the top level aren't globals, but we expect them to be. Explicitly make the version variables global.

Props nbachiyski.
Fixes #23685.



git-svn-id: https://develop.svn.wordpress.org/trunk@26008 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2013-11-05 00:23:38 +00:00
parent 0923b7b93a
commit 268667e170
2 changed files with 9 additions and 0 deletions

View File

@ -1,4 +1,6 @@
<?php
global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;
/**
* The WordPress version string
*

View File

@ -20,6 +20,13 @@ define( 'WPINC', 'wp-includes' );
// Include files required for initialization.
require( ABSPATH . WPINC . '/load.php' );
require( ABSPATH . WPINC . '/default-constants.php' );
/*
* These can't be directly globalized in version.php. When updating,
* we're including version.php from another install and don't want
* these values to be overridden if already set.
*/
global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;
require( ABSPATH . WPINC . '/version.php' );
// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.