← Back to branch summary

~canonical-sysadmins/wordpress/4.8.1

« back to all changes in this revision

Viewing changes to wp-activate.php

  • Committer: Barry Price
  • Date: 2016-08-17 04:50:12 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: barry.price@canonical.com-20160817045012-qfui81zhqnqv2ba9
Merge WP4.6 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-activate.php
32
32
do_action( 'activate_header' );
33
33
 
34
34
/**
35
 
 * Adds an action hook specific to this page that fires on wp_head
 
35
 * Adds an action hook specific to this page.
 
36
 *
 
37
 * Fires on {@see 'wp_head'}.
36
38
 *
37
39
 * @since MU
38
40
 */
39
41
function do_activate_header() {
40
 
    /**
41
 
     * Fires before the Site Activation page is loaded, but on the wp_head action.
 
42
        /**
 
43
         * Fires before the Site Activation page is loaded.
 
44
         *
 
45
         * Fires on the {@see 'wp_head'} action.
42
46
     *
43
47
     * @since 3.0.0
44
48
     */
88
92
                $result = wpmu_activate_signup( $key );
89
93
                if ( is_wp_error($result) ) {
90
94
                        if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
91
 
                            $signup = $result->get_error_data();
 
95
                                $signup = $result->get_error_data();
92
96
                                ?>
93
97
                                <h2><?php _e('Your account is now active!'); ?></h2>
94
98
                                <?php
95
99
                                echo '<p class="lead-in">';
96
100
                                if ( $signup->domain . $signup->path == '' ) {
97
 
                                        printf( __('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' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() );
 
101
                                        printf(
 
102
                                                /* translators: 1: login URL, 2: username, 3: user email, 4: lost password URL */
 
103
                                                __( '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>.' ),
 
104
                                                network_site_url( 'wp-login.php', 'login' ),
 
105
                                                $signup->user_login,
 
106
                                                $signup->user_email,
 
107
                                                wp_lostpassword_url()
 
108
                                        );
98
109
                                } else {
99
 
                                        printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$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="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() );
 
110
                                        printf(
 
111
                                                /* translators: 1: site URL, 2: site domain, 3: username, 4: user email, 5: lost password URL */
 
112
                                                __( 'Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$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="%5$s">reset your password</a>.' ),
 
113
                                                'http://' . $signup->domain,
 
114
                                                $signup->domain,
 
115
                                                $signup->user_login,
 
116
                                                $signup->user_email,
 
117
                                                wp_lostpassword_url()
 
118
                                        );
100
119
                                }
101
120
                                echo '</p>';
102
121
                        } else {
103
122
                                ?>
104
 
                                <h2><?php _e('An error occurred during the activation'); ?></h2>
 
123
                                <h2><?php _e( 'An error occurred during the activation' ); ?></h2>
 
124
                                <p><?php echo $result->get_error_message(); ?></p>
105
125
                                <?php
106
 
                            echo '<p>'.$result->get_error_message().'</p>';
107
126
                        }
108
127
                } else {
109
128
                        $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
121
140
                                $login_url = wp_login_url();
122
141
                                restore_current_blog();
123
142
                                ?>
124
 
                                <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>
 
143
                                <p class="view"><?php
 
144
                                        /* translators: 1: site URL, 2: login URL */
 
145
                                        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 ) );
 
146
                                ?></p>
125
147
                        <?php else: ?>
126
 
                                <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>
 
148
                                <p class="view"><?php
 
149
                                        /* translators: 1: login URL, 2: network home URL */
 
150
                                        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() );
 
151
                                ?></p>
127
152
                        <?php endif;
128
153
                }
129
154
        }