Changeset 34790 for trunk/src/wp-activate.php

Timestamp:

10/03/2015 12:33:47 AM (10 years ago)

Author:

johnbillion

Message:

Use wp_login_url() for login links when signing up for a new blog or activating a new blog on Multisite.

Fixes #31495
Props GregLone for the intial patch

File:

• trunk/src/wp-activate.php (modified) (1 diff)

trunk/src/wp-activate.php

@@ -116 +116 @@
             </div>
 
-            <?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
-                <p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
+            <?php if ( $url && $url != network_home_url( '', 'http' ) ) :
+                switch_to_blog( (int) $result['blog_id'] ); 
+                $login_url = wp_login_url(); 
+                restore_current_blog(); 
+                ?>
+                <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>' ), $url, esc_url( $login_url ) ); ?></p>
             <?php else: ?>
                 <p class="view"><?php 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() ); ?></p>