Changeset 50393

Timestamp:

02/20/2021 09:53:48 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Script Loader: Explicitly declare the $pagenow global in wp_deregister_script().

This avoids an "Undefined index" PHP notice in wp_resource_hints() tests when running the full test suite.

Remove the unused global from get_home_url().

Follow-up to [25443], [38100], [38174], [50156], [50164].

Props peterwilsoncc.
Fixes #52566.

Location:

trunk/src/wp-includes

Files:

• functions.wp-scripts.php (modified) (2 diffs)
• link-template.php (modified) (2 diffs)

trunk/src/wp-includes/functions.wp-scripts.php

@@ -259 +259 @@
  * @since 2.1.0
  *
+ * @global string $pagenow
+ *
  * @param string $handle Name of the script to be removed.
  */
 function wp_deregister_script( $handle ) {
+    global $pagenow;
+
     _wp_scripts_maybe_doing_it_wrong( __FUNCTION__, $handle );
 
@@ -270 +274 @@
     $current_filter = current_filter();
     if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) ||
-        ( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
+        ( 'wp-login.php' === $pagenow && 'login_enqueue_scripts' !== $current_filter )
     ) {
         $not_allowed = array(

trunk/src/wp-includes/link-template.php

@@ -3254 +3254 @@
  * @since 3.0.0
  *
- * @global string $pagenow
- *
  * @param int|null    $blog_id Optional. Site ID. Default null (current site).
  * @param string      $path    Optional. Path relative to the home URL. Default empty.
@@ -3263 +3261 @@
  */
 function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
-    global $pagenow;
-
     $orig_scheme = $scheme;