From 466a0574229439801a580ef1e0ccfa9b06064cbb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 28 Jul 2020 17:40:05 +0000 Subject: [PATCH] Login and Registration: Only call `get_blog_details()` in `wp_lostpassword_url()` on Multisite. The function does not exist on single site. Follow-up to [48672]. See #39311. Built from https://develop.svn.wordpress.org/trunk@48673 git-svn-id: http://core.svn.wordpress.org/trunk@48435 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/general-template.php | 9 +++++++-- wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 8ccb47c875..82228c2021 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -613,9 +613,14 @@ function wp_lostpassword_url( $redirect = '' ) { $args['redirect_to'] = urlencode( $redirect ); } - $blog_details = get_blog_details(); + $site_path = ''; - $lostpassword_url = add_query_arg( $args, network_site_url( $blog_details->path . 'wp-login.php', 'login' ) ); + if ( is_multisite() ) { + $blog_details = get_blog_details(); + $site_path = $blog_details->path . 'wp-login.php'; + } + + $lostpassword_url = add_query_arg( $args, network_site_url( $site_path . 'wp-login.php', 'login' ) ); /** * Filters the Lost Password URL. diff --git a/wp-includes/version.php b/wp-includes/version.php index 5294490b4a..f22fb2ca0a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-beta4-48672'; +$wp_version = '5.5-beta4-48673'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.