From 8af6a4230e6293beb481ff21709d245dff6be21b Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Tue, 13 May 2014 03:14:16 +0000
Subject: [PATCH] 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
---
 wp-activate.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/wp-activate.php b/wp-activate.php
index 5e9be6ea82..cce96dc57c 100644
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -84,7 +84,7 @@ get_header();
 	<?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();
@@ -105,15 +105,14 @@ get_header();
 			    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 = 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') ) : ?>