sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Props jaydeep-rami, sabernhardt.
Fixes #44932.

git-svn-id: https://develop.svn.wordpress.org/trunk@48971 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2020-09-12 00:10:16 +00:00
parent 2c843f03d5
commit 9066eb15a2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-admin/includes/class-plugin-upgrader.php
View File

@ -406,13 +406,14 @@ class Plugin_Upgrader extends WP_Upgrader {
* @since 3.3.0 * @since 3.3.0
* *
* @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass. * @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. * @param string $source The path to the downloaded package source.
* @return string|WP_Error The source as passed, or a WP_Error object * @return string|WP_Error The source as passed, or a WP_Error object
* if no plugins were found. * if no plugins were found.
*/ */
public function check_package( $source ) { public function check_package( $source ) {
global $wp_filesystem; global $wp_filesystem, $wp_version;
$this->new_plugin_data = array(); $this->new_plugin_data = array();
@ -459,7 +460,7 @@ class Plugin_Upgrader extends WP_Upgrader {
$error = sprintf( $error = sprintf(
/* translators: 1: Current WordPress version, 2: Version required by the uploaded plugin. */ /* 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.' ), __( 'Your WordPress version is %1$s, however the uploaded plugin requires %2$s.' ),
$GLOBALS['wp_version'], $wp_version,
$requires_wp $requires_wp
); );

5
src/wp-admin/includes/class-theme-upgrader.php
View File

@ -519,12 +519,13 @@ class Theme_Upgrader extends WP_Upgrader {
* @since 3.3.0 * @since 3.3.0
* *
* @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass. * @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. * @param string $source The full path to the package source.
* @return string|WP_Error The source or a WP_Error. * @return string|WP_Error The source or a WP_Error.
*/ */
public function check_package( $source ) { public function check_package( $source ) {
global $wp_filesystem; global $wp_filesystem, $wp_version;
$this->new_theme_data = array(); $this->new_theme_data = array();
@ -606,7 +607,7 @@ class Theme_Upgrader extends WP_Upgrader {
$error = sprintf( $error = sprintf(
/* translators: 1: Current WordPress version, 2: Version required by the uploaded theme. */ /* 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.' ), __( 'Your WordPress version is %1$s, however the uploaded theme requires %2$s.' ),
$GLOBALS['wp_version'], $wp_version,
$requires_wp $requires_wp
); );

6
src/wp-includes/default-constants.php
View File

@ -16,7 +16,7 @@
* @global string $wp_version The WordPress version string. * @global string $wp_version The WordPress version string.
*/ */
function wp_initial_constants() { function wp_initial_constants() {
global $blog_id; global $blog_id, $wp_version;
/**#@+ /**#@+
* Constants for expressing human-readable data sizes in their respective number of bytes. * Constants for expressing human-readable data sizes in their respective number of bytes.
@ -99,8 +99,8 @@ function wp_initial_constants() {
// Add define( 'SCRIPT_DEBUG', true ); to wp-config.php to enable loading of non-minified, // Add define( 'SCRIPT_DEBUG', true ); to wp-config.php to enable loading of non-minified,
// non-concatenated scripts and stylesheets. // non-concatenated scripts and stylesheets.
if ( ! defined( 'SCRIPT_DEBUG' ) ) { if ( ! defined( 'SCRIPT_DEBUG' ) ) {
if ( ! empty( $GLOBALS['wp_version'] ) ) { if ( ! empty( $wp_version ) ) {
$develop_src = false !== strpos( $GLOBALS['wp_version'], '-src' ); $develop_src = false !== strpos( $wp_version, '-src' );
} else { } else {
$develop_src = false; $develop_src = false;
} }