<?php
/**
* Confirms that the activation key that is sent in an email after a user signs
- * up for a new blog matches the key for that user and then displays confirmation.
+ * up for a new site matches the key for that user and then displays confirmation.
*
* @package WordPress
*/
require( dirname( __FILE__ ) . '/wp-blog-header.php' );
if ( !is_multisite() ) {
- wp_redirect( site_url( '/wp-login.php?action=register' ) );
+ wp_redirect( wp_registration_url() );
die();
}
/**
* Fires before the Site Activation page is loaded.
*
- * @since 3.0
+ * @since 3.0.0
*/
do_action( 'activate_header' );
/**
* Fires before the Site Activation page is loaded, but on the wp_head action.
*
- * @since 3.0
+ * @since 3.0.0
*/
do_action( 'activate_wp_head' );
}
#submit, #key { width: 90%; font-size: 24px; }
#language { margin-top: .5em; }
.error { background: #f66; }
- span.h3 { padding: 0 8px; font-size: 1.3em; font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; font-weight: bold; color: #333; }
+ span.h3 { padding: 0 8px; font-size: 1.3em; font-weight: bold; }
</style>
<?php
}
add_action( 'wp_head', 'wpmu_activate_stylesheet' );
-get_header();
+get_header( 'wp-activate' );
?>
-<div id="content" class="widecolumn">
+<div id="signup-content" class="widecolumn">
+ <div class="wp-activate-container">
<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
<h2><?php _e('Activation Key Required') ?></h2>
<?php } else {
$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
- $result = wpmu_activate_signup($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();
echo '<p>'.$result->get_error_message().'</p>';
}
} else {
- extract($result);
- $url = get_blogaddress_by_id( (int) $blog_id);
- $user = get_userdata( (int) $user_id);
+ $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 $password; ?></p>
+ <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
</div>
- <?php if ( $url != network_home_url('', 'http') ) : ?>
- <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, $url . 'wp-login.php' ); ?></p>
+ <?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;
}
}
?>
+ </div>
</div>
<script type="text/javascript">
var key_input = document.getElementById('key');
key_input && key_input.focus();
</script>
-<?php get_footer(); ?>
+<?php get_footer( 'wp-activate' );