Changeset 28373 for trunk/src/wp-activate.php

Timestamp:

05/13/2014 03:13:21 AM (11 years ago)

Author:

wonderboymusic

Message:

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

Props jeremyfelt, MikeHansenMe.
See #22400.

File:

• trunk/src/wp-activate.php (modified) (3 diffs)

trunk/src/wp-activate.php

@@ -85 +85 @@
 
         $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() ) {
@@ -106 +106 @@
             }
         } 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>
@@ -114 +113 @@
             <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>