Changeset 31124

Timestamp:

01/10/2015 05:56:45 AM (10 years ago)

Author:

wonderboymusic

Message:

Declare $wp_version, $required_php_version, and $required_mysql_version as globals in install and upgrade admin files.

See #30799.

Location:

trunk/src/wp-admin

Files:

• includes/update-core.php (modified) (2 diffs)
• install.php (modified) (1 diff)
• options-general.php (modified) (1 diff)
• upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/update-core.php

@@ -813 +813 @@
     // Import $wp_version, $required_php_version, and $required_mysql_version from the new version
     // $wp_filesystem->wp_content_dir() returned unslashed pre-2.8
+    global $wp_version, $required_php_version, $required_mysql_version;
+
     $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
     if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
@@ -825 +827 @@
     $php_version    = phpversion();
     $mysql_version  = $wpdb->db_version();
-    $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from
+    $old_wp_version = $wp_version; // The version of WordPress we're updating from
     $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' )  ); // a dash in the version indicates a Development release
     $php_compat     = version_compare( $php_version, $required_php_version, '>=' );

trunk/src/wp-admin/install.php

@@ -159 +159 @@
     die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p><p class="step"><a href="../wp-login.php" class="button button-large">' . __( 'Log In' ) . '</a></p></body></html>' );
 }
+
+global $wp_version, $required_php_version, $required_mysql_version;
 
 $php_version    = phpversion();

trunk/src/wp-admin/options-general.php

@@ -320 +320 @@
 <td><select name="start_of_week" id="start_of_week">
 <?php
+global $wp_locale;
+
 for ($day_index = 0; $day_index <= 6; $day_index++) :
     $selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';

trunk/src/wp-admin/upgrade.php

@@ -35 +35 @@
     die( '0' );
 }
+
+global $wp_version, $required_php_version, $required_mysql_version;
 
 $step = (int) $step;