From 4773bc569924f2e5ca31dff5be17ff99c8498e42 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 2 Feb 2021 20:37:05 +0000 Subject: [PATCH] General: Restore the `$pagenow` global in `get_home_url()`. This fixes test failures in `Tests_WP_Resource_Hints`. Follow-up to [50156]. See #52421. Built from https://develop.svn.wordpress.org/trunk@50164 git-svn-id: http://core.svn.wordpress.org/trunk@49843 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/link-template.php | 4 ++++ wp-includes/version.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index daf73ca016..64024b1166 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -3253,6 +3253,8 @@ function home_url( $path = '', $scheme = null ) { * * @since 3.0.0 * + * @global string $pagenow + * * @param int $blog_id Optional. Site ID. Default null (current site). * @param string $path Optional. Path relative to the home URL. Default empty. * @param string|null $scheme Optional. Scheme to give the home URL context. Accepts @@ -3260,6 +3262,8 @@ function home_url( $path = '', $scheme = null ) { * @return string Home URL link with optional path appended. */ function get_home_url( $blog_id = null, $path = '', $scheme = null ) { + global $pagenow; + $orig_scheme = $scheme; if ( empty( $blog_id ) || ! is_multisite() ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 1f3938e90d..bc2131f824 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-50163'; +$wp_version = '5.7-alpha-50164'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.