Changeset 48971

Timestamp:

09/12/2020 12:10:16 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Explicitly declare the $wp_version global used in some core files.

Props jaydeep-rami, sabernhardt.
Fixes #44932.

Location:

trunk/src

Files:

• wp-admin/includes/class-plugin-upgrader.php (modified) (3 diffs)
• wp-admin/includes/class-theme-upgrader.php (modified) (3 diffs)
• wp-includes/default-constants.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-plugin-upgrader.php

@@ -407 +407 @@
          *
          * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+         * @global string             $wp_version    The WordPress version string.
          *
          * @param string $source The path to the downloaded package source.
@@ -413 +414 @@
          */
         public function check_package( $source ) {
-                global $wp_filesystem;
+                global $wp_filesystem, $wp_version;
 
                 $this->new_plugin_data = array();
@@ -460 +461 @@
                                 /* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */
                                 __( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
-                                $GLOBALS['wp_version'],
+                                $wp_version,
                                 $requires_wp
                         );

trunk/src/wp-admin/includes/class-theme-upgrader.php

@@ -520 +520 @@
          *
          * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
+         * @global string             $wp_version    The WordPress version string.
          *
          * @param string $source The full path to the package source.
@@ -525 +526 @@
          */
         public function check_package( $source ) {
-                global $wp_filesystem;
+                global $wp_filesystem, $wp_version;
 
                 $this->new_theme_data = array();
@@ -607 +608 @@
                                 /* translators: 1: Current WordPress version, 2: Version required by the uploaded theme. */
                                 __( 'Your WordPress version is %1$s, however the uploaded theme requires %2$s.' ),
-                                $GLOBALS['wp_version'],
+                                $wp_version,
                                 $requires_wp
                         );

trunk/src/wp-includes/default-constants.php

@@ -17 +17 @@
  */
 function wp_initial_constants() {
-        global $blog_id;
+        global $blog_id, $wp_version;
 
         /**#@+
@@ -100 +100 @@
         // non-concatenated scripts and stylesheets.
         if ( ! defined( 'SCRIPT_DEBUG' ) ) {
-                if ( ! empty( $GLOBALS['wp_version'] ) ) {
-                        $develop_src = false !== strpos( $GLOBALS['wp_version'], '-src' );
+                if ( ! empty( $wp_version ) ) {
+                        $develop_src = false !== strpos( $wp_version, '-src' );
                 } else {
                         $develop_src = false;