Eliminate use of extract() in wp-activate.php.

Props jeremyfelt, MikeHansenMe.
See #22400.

Built from https://develop.svn.wordpress.org/trunk@28373


git-svn-id: http://core.svn.wordpress.org/trunk@28201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-13 03:14:16 +00:00
parent f32dbfe62c
commit 8af6a4230e

View File

@ -105,15 +105,14 @@ get_header();
echo '<p>'.$result->get_error_message().'</p>'; echo '<p>'.$result->get_error_message().'</p>';
} }
} else { } else {
extract($result); $url = get_blogaddress_by_id( (int) $result['blog_id'] );
$url = get_blogaddress_by_id( (int) $blog_id); $user = get_userdata( (int) $result['user_id'] );
$user = get_userdata( (int) $user_id);
?> ?>
<h2><?php _e('Your account is now active!'); ?></h2> <h2><?php _e('Your account is now active!'); ?></h2>
<div id="signup-welcome"> <div id="signup-welcome">
<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p> <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> </div>
<?php if ( $url != network_home_url('', 'http') ) : ?> <?php if ( $url != network_home_url('', 'http') ) : ?>