Changeset 26008

Timestamp:

11/05/2013 12:23:38 AM (11 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src

Files:

• wp-includes/version.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/version.php

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

trunk/src/wp-settings.php

@@ -21 +21 @@
 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' );