Ticket #23685: globalize-version-vars-in-wp-settings.diff

wp-settings.php

@@ -20 +20 @@
 // Include files required for initialization.
 require( ABSPATH . WPINC . '/load.php' );
 require( ABSPATH . WPINC . '/default-constants.php' );
+
+/*
+ * We can't globalzie them directly in version.php, because when updating
+ * we're including version.php from another install and we wouldn't want
+ * this to replace the current version globals
+ */
+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.