Make WordPress Core

Changeset 28373


Ignore:
Timestamp:
05/13/2014 03:13:21 AM (10 years ago)
Author:
wonderboymusic
Message:

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

Props jeremyfelt, MikeHansenMe.
See #22400.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-activate.php

    r26868 r28373  
    8585
    8686        $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
    87         $result = wpmu_activate_signup($key);
     87        $result = wpmu_activate_signup( $key );
    8888        if ( is_wp_error($result) ) {
    8989            if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
     
    106106            }
    107107        } else {
    108             extract($result);
    109             $url = get_blogaddress_by_id( (int) $blog_id);
    110             $user = get_userdata( (int) $user_id);
     108            $url = get_blogaddress_by_id( (int) $result['blog_id'] );
     109            $user = get_userdata( (int) $result['user_id'] );
    111110            ?>
    112111            <h2><?php _e('Your account is now active!'); ?></h2>
     
    114113            <div id="signup-welcome">
    115114                <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
    116                 <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
     115                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
    117116            </div>
    118117
Note: See TracChangeset for help on using the changeset viewer.