Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-02 13:41:24 +01:00
Code Issues Projects Releases Wiki Activity

General: Restore the $pagenow global in get_home_url().

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2021-02-02 20:37:05 +00:00
parent 8e8fe6d2c0
commit 4773bc5699
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/link-template.php
View File

@ -3253,6 +3253,8 @@ function home_url( $path = '', $scheme = null ) {
* *
* @since 3.0.0 * @since 3.0.0
* *
* @global string $pagenow
*
* @param int $blog_id Optional. Site ID. Default null (current site). * @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 $path Optional. Path relative to the home URL. Default empty.
* @param string|null $scheme Optional. Scheme to give the home URL context. Accepts * @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. * @return string Home URL link with optional path appended.
*/ */
function get_home_url( $blog_id = null, $path = '', $scheme = null ) { function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
global $pagenow;
$orig_scheme = $scheme; $orig_scheme = $scheme;
if ( empty( $blog_id ) || ! is_multisite() ) { if ( empty( $blog_id ) || ! is_multisite() ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.