Changeset 48672
- Timestamp:
- 07/28/2020 05:18:06 PM (5 years ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-activate.php
r47550 r48672 118 118 119 119 get_header( 'wp-activate' ); 120 121 $blog_details = get_blog_details(); 120 122 ?> 121 123 … … 125 127 126 128 <h2><?php _e( 'Activation Key Required' ); ?></h2> 127 <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( 'wp-activate.php' ); ?>">129 <form name="activateform" id="activateform" method="post" action="<?php echo network_site_url( $blog_details->path . 'wp-activate.php' ); ?>"> 128 130 <p> 129 131 <label for="key"><?php _e( 'Activation Key:' ); ?></label> … … 147 149 /* translators: 1: Login URL, 2: Username, 3: User email address, 4: Lost password URL. */ 148 150 __( 'Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of “%2$s”. 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>.' ), 149 network_site_url( 'wp-login.php', 'login' ),151 network_site_url( $blog_details->path . 'wp-login.php', 'login' ), 150 152 $signup->user_login, 151 153 $signup->user_email, … … 156 158 /* translators: 1: Site URL, 2: Username, 3: User email address, 4: Lost password URL. */ 157 159 __( 'Your site at %1$s is active. You may now log in to your site using your chosen username of “%2$s”. 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>.' ), 158 sprintf( '<a href="http://%1$s ">%1$s</a>', $signup->domain),160 sprintf( '<a href="http://%1$s%2$s">%1$s%2$s</a>', $signup->domain, $blog_details->path ), 159 161 $signup->user_login, 160 162 $signup->user_email, … … 196 198 <p class="view"> 197 199 <?php 198 /* translators: 1: Login URL, 2: Network home URL. */ 199 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() ); 200 printf( 201 /* translators: 1: Login URL, 2: Network home URL. */ 202 __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), 203 network_site_url( $blog_details->path . 'wp-login.php', 'login' ), 204 network_home_url( $blog_details->path ) 205 ); 200 206 ?> 201 207 </p> -
trunk/src/wp-includes/general-template.php
r48573 r48672 606 606 */ 607 607 function wp_lostpassword_url( $redirect = '' ) { 608 $args = array(); 608 $args = array( 609 'action' => 'lostpassword', 610 ); 611 609 612 if ( ! empty( $redirect ) ) { 610 613 $args['redirect_to'] = urlencode( $redirect ); 611 614 } 612 615 613 $lostpassword_url = add_query_arg( $args, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 616 $blog_details = get_blog_details(); 617 618 $lostpassword_url = add_query_arg( $args, network_site_url( $blog_details->path . 'wp-login.php', 'login' ) ); 614 619 615 620 /**
Note: See TracChangeset
for help on using the changeset viewer.