Changeset 48672

Timestamp:

07/28/2020 05:18:06 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Login and Registration: Link to the correct site after activating a user on a Multisite install in subdirectory mode.

Props pkarjala, Mista-Flo, tmoore41, Ipstenu, ksoares, mukesh27, whyisjake.
Fixes #39311.

Location:

trunk/src

Files:

• wp-activate.php (modified) (5 diffs)
• wp-includes/general-template.php (modified) (1 diff)

trunk/src/wp-activate.php

@@ -118 +118 @@
 
 get_header( 'wp-activate' );
+
+$blog_details = get_blog_details();
 ?>
 
@@ -125 +127 @@
 
         <h2><?php _e( 'Activation Key Required' ); ?></h2>
-        <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">
+        <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>">
             <p>
                 <label for="key"><?php _e( 'Activation Key:' ); ?></label>
@@ -147 +149 @@
                     /* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */
                     __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-                    network_site_url( 'wp-login.php', 'login' ),
+                    network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
                     $signup->user_login,
                     $signup->user_email,
@@ -156 +158 @@
                     /* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */
                     __( 'Your site at %1$s is active. You may now log in to your site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.' ),
-                    sprintf( '<a href="http://%1$s">%1$s</a>', $signup->domain ),
+                    sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ),
                     $signup->user_login,
                     $signup->user_email,
@@ -196 +198 @@
                 <p class="view">
                 <?php
-                    /* translators: 1: Login URL, 2: Network home URL. */
-                    printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
+                    printf(
+                        /* translators: 1: Login URL, 2: Network home URL. */
+                        __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ),
+                        network_site_url( $blog_details->path . 'wp-login.php', 'login' ),
+                        network_home_url( $blog_details->path )
+                    );
                 ?>
                 </p>

trunk/src/wp-includes/general-template.php

@@ -606 +606 @@
  */
 function wp_lostpassword_url( $redirect = '' ) {
-    $args = array();
+    $args = array(
+        'action' => 'lostpassword',
+    );
+
     if ( ! empty( $redirect ) ) {
         $args['redirect_to'] = urlencode( $redirect );
     }
 
-    $lostpassword_url = add_query_arg( $args, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );
+    $blog_details = get_blog_details();
+
+    $lostpassword_url = add_query_arg( $args, network_site_url( $blog_details->path . 'wp-login.php', 'login' ) );
 
     /**