diff --git wp-activate.php wp-activate.php
index b13279a..9a9272b 100644
|
|
get_header( 'wp-activate' ); |
98 | 98 | <?php |
99 | 99 | echo '<p class="lead-in">'; |
100 | 100 | if ( $signup->domain . $signup->path == '' ) { |
| 101 | $meta = maybe_unserialize( $signup->meta ); |
| 102 | $url = isset( $meta['add_to_blog'] ) ? get_home_url( (int) $meta['add_to_blog'] ) : ''; |
| 103 | if ( $url && $url != network_home_url( '', 'http' ) ) { |
| 104 | switch_to_blog( (int) $meta['add_to_blog'] ); |
| 105 | $login_url = wp_login_url(); |
| 106 | restore_current_blog(); |
| 107 | } else { |
| 108 | $login_url = network_site_url( 'wp-login.php', 'login' ); |
| 109 | } |
101 | 110 | printf( |
102 | 111 | /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */ |
103 | 112 | __( '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>.' ), |
104 | | network_site_url( 'wp-login.php', 'login' ), |
| 113 | $login_url, |
105 | 114 | $signup->user_login, |
106 | 115 | $signup->user_email, |
107 | 116 | wp_lostpassword_url() |
… |
… |
get_header( 'wp-activate' ); |
125 | 134 | <?php |
126 | 135 | } |
127 | 136 | } else { |
128 | | $url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : ''; |
| 137 | $url = isset( $result['meta']['add_to_blog'] ) ? get_home_url( (int) $result['meta']['add_to_blog'] ) : ''; |
129 | 138 | $user = get_userdata( (int) $result['user_id'] ); |
130 | 139 | ?> |
131 | 140 | <h2><?php _e('Your account is now active!'); ?></h2> |
… |
… |
get_header( 'wp-activate' ); |
136 | 145 | </div> |
137 | 146 | |
138 | 147 | <?php if ( $url && $url != network_home_url( '', 'http' ) ) : |
139 | | switch_to_blog( (int) $result['blog_id'] ); |
| 148 | switch_to_blog( (int) $result['meta']['add_to_blog'] ); |
140 | 149 | $login_url = wp_login_url(); |
141 | 150 | restore_current_blog(); |
142 | 151 | ?> |