Ticket #28352: 28352.2.diff

src/wp-activate.php

@@ -84 +84 @@
 
         <?php } else {
 
-                $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+                $key = !empty( $_GET['key'] ) ? $_GET['key'] : $_POST['key'];
                 $result = wpmu_activate_signup( $key );
-                if ( is_wp_error($result) ) {
+                if ( is_wp_error( $result ) ) {
                         if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
                             $signup = $result->get_error_data();
-                                ?>
-                                <h2><?php _e('Your account is now active!'); ?></h2>
-                                <?php
-                                echo '<p class="lead-in">';
+                                $message =
+                                "<h2>". _( 'Your account is now active!' ) . "</h2>
+
+                                <p class='lead-in'>";
                                 if ( $signup->domain . $signup->path == '' ) {
-                                        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() );
+                                        $message .= sprintf( __('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() );
                                 } else {
-                                        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() );
+                                        $message .= sprintf( __('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() );
                                 }
-                                echo '</p>';
+                                $message = "</p>";
                         } else {
-                                ?>
-                                <h2><?php _e('An error occurred during the activation'); ?></h2>
-                                <?php
-                            echo '<p>'.$result->get_error_message().'</p>';
+                                $message = 
+                                "<h2>" . _( 'An error occurred during the activation' ) . "</h2>
+                            <p>" . $result->get_error_message() . "</p>";
                         }
+
+                        /** 
+                         * Filter the activation error message 
+                         * 
+                         * @since 4.2
+                         * 
+                         * @param string $message 
+                         * @param string $url, site url 
+                         * @param object $user, WP_User object 
+                         * @param array $result, An array containing information about the activated user and/or blog 
+                         */
+                        echo apply_filters ( 'signup_activation_error', $message, $url, $user, $result ); 
+
                 } else {
                         $url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
                         $user = get_userdata( (int) $result['user_id'] );
-                        ?>
-                        <h2><?php _e('Your account is now active!'); ?></h2>
 
-                        <div id="signup-welcome">
-                                <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
-                                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
-                        </div>
+                        $message = 
+                        "<h2>" . _( 'Your account is now active!' ) . "</h2>
+                        <div id='signup-welcome'>
+                                <p><span class='h3'>" . _( 'Username:' ) . "</span> " . $user->user_login . "</p>
+                                <p><span class='h3'>" . _( 'Password:' ) . "</span> " . $result['password'] . "</p>
+                        </div>";
 
-                        <?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>
-                        <?php endif;
+                        if ( $url && $url != network_home_url( '', 'http' ) ) {
+                                $message .= "<p class='view'>" . sprintf( __( '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>";
+                        } else {
+                                $message .= "<p class='view'>" . sprintf( __( '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>";
+                        }
+                        /** 
+                         * Filter the activation success message 
+                         * 
+                         * @since 4.2
+                         * 
+                         * @param string $message 
+                         * @param string $url, site url 
+                         * @param object $user, WP_User object 
+                         * @param array $result, An array containing information about the activated user and/or blog 
+                         */
+                        echo apply_filters ( 'signup_activation_success', $message, $url, $user, $result );
                 }
         }
         ?>