Ticket #21352: lost_password_multisite_patch.diff

Index: wp-login.php
===================================================================
--- wp-login.php        (revision 21304)
+++ wp-login.php        (working copy)
@@ -223,11 +223,11 @@
                $wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
        }
        $message = __('Someone requested that the password be reset for the following account:') . "\r\n\r\n";
-       $message .= network_home_url( '/' ) . "\r\n\r\n";
+       $message .= home_url( '/' ) . "\r\n\r\n";
        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
        $message .= __('If this was a mistake, just ignore this email and nothing will happen.') . "\r\n\r\n";
        $message .= __('To reset your password, visit the following address:') . "\r\n\r\n";
-       $message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
+       $message .= '<' . site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . ">\r\n";
 
        if ( is_multisite() )
                $blogname = $GLOBALS['current_site']->site_name;
Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php    (revision 21304)
+++ wp-includes/general-template.php    (working copy)
@@ -312,7 +312,7 @@
                $args['redirect_to'] = $redirect;
        }
 
-       $lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+       $lostpassword_url = add_query_arg( $args, site_url('wp-login.php', 'login') );
        return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
 }