From 404b1a423842e379c6bedd15fc451aecced29c5c Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 28 Jul 2020 17:44:06 +0000
Subject: [PATCH] Login and Registration: Correct the logic for determining the
 path to `wp-login.php` in `wp_lostpassword_url()`.

Follow-up to [48672], [48673].

See #39311.
Built from https://develop.svn.wordpress.org/trunk@48674


git-svn-id: http://core.svn.wordpress.org/trunk@48436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 10 +++++-----
 wp-includes/version.php          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 82228c2021..f88e342ce2 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -613,14 +613,14 @@ function wp_lostpassword_url( $redirect = '' ) {
 		$args['redirect_to'] = urlencode( $redirect );
 	}
 
-	$site_path = '';
-
 	if ( is_multisite() ) {
-		$blog_details = get_blog_details();
-		$site_path    = $blog_details->path . 'wp-login.php';
+		$blog_details  = get_blog_details();
+		$wp_login_path = $blog_details->path . 'wp-login.php';
+	} else {
+		$wp_login_path = 'wp-login.php';
 	}
 
-	$lostpassword_url = add_query_arg( $args, network_site_url( $site_path . 'wp-login.php', 'login' ) );
+	$lostpassword_url = add_query_arg( $args, network_site_url( $wp_login_path, 'login' ) );
 
 	/**
 	 * Filters the Lost Password URL.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f22fb2ca0a..082e67e200 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-beta4-48673';
+$wp_version = '5.5-beta4-48674';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.