From 92ba8748aa85bf0dcf2cabdc6a72d98c5de773c8 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 5 Nov 2013 00:24:10 +0000
Subject: [PATCH] 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.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/version.php | 2 ++
 wp-settings.php         | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/wp-includes/version.php b/wp-includes/version.php
index eaad127758..eb2c7a3671 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -1,4 +1,6 @@
 <?php
+global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_mysql_version;
+
 /**
  * The WordPress version string
  *
diff --git a/wp-settings.php b/wp-settings.php
index 260a6fb9cb..40d3a61e1a 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -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.