Index: wp-activate.php =================================================================== --- wp-activate.php (revision 28397) +++ wp-activate.php (working copy) @@ -86,40 +86,70 @@ $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key']; $result = wpmu_activate_signup( $key ); if ( is_wp_error($result) ) { - if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) { - $signup = $result->get_error_data(); - ?> -
- '; - if ( $signup->domain . $signup->path == '' ) { - printf( __('Your account has been activated. You may now log in 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 reset your password.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + /** + * Filter the signup activation error message + * + * @since 4.0 + * + * @param string $message + * @param string $result->get_error_code(), error code received while activating the user or blog + * @param array $result, An array containing information about the activated user and/or blog + */ + $message = apply_filters ( 'signup_activation_error', $message = '', $result->get_error_code(), $result ); + if ( $message ) { + echo $message; + }else { + if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) { + $signup = $result->get_error_data(); + ?> + + '; + if ( $signup->domain . $signup->path == '' ) { + printf( __( 'Your account has been activated. You may now log in 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 reset your password.' ), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + } else { + printf( __( 'Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. 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 reset your password.' ), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + } + echo ''; } else { - printf( __('Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. 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 reset your password.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + ?> + + ' . $result->get_error_message() . ''; } - echo ''; - } else { - ?> - - '.$result->get_error_message().''; } } else { $url = get_blogaddress_by_id( (int) $result['blog_id'] ); $user = get_userdata( (int) $result['user_id'] ); - ?> - + /** + * Filter the activation success message + * + * @since 4.0 + * + * @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 + */ + $message = apply_filters ( 'signup_activation_success', $message = '', $url, $user, $result ); + if ( $message ) { + echo $message; + }else { + ?> + -user_login ?>
--
user_login ?>
- -View your site or Log in'), $url, $url . 'wp-login.php' ); ?>
- -Log in or go back to the homepage.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?>
- +View your site or Log in' ), $url, $url . 'wp-login.php' ); ?>
+ +Log in or go back to the homepage.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() ); ?>
+