Ticket #22400: 22400.wp-activate.php.2.diff
File 22400.wp-activate.php.2.diff, 1.3 KB (added by , 8 years ago) |
---|
-
src/wp-activate.php
71 71 <?php } else { 72 72 73 73 $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key']; 74 $result = wpmu_activate_signup( $key);74 $result = wpmu_activate_signup( $key ); 75 75 if ( is_wp_error($result) ) { 76 76 if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) { 77 77 $signup = $result->get_error_data(); … … 92 92 echo '<p>'.$result->get_error_message().'</p>'; 93 93 } 94 94 } else { 95 extract($result); 96 $url = get_blogaddress_by_id( (int) $blog_id); 97 $user = get_userdata( (int) $user_id); 95 $url = get_blogaddress_by_id( (int) $result['blog_id'] ); 96 $user = get_userdata( (int) $result['user_id'] ); 98 97 ?> 99 98 <h2><?php _e('Your account is now active!'); ?></h2> 100 99 101 100 <div id="signup-welcome"> 102 101 <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p> 103 <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $ password; ?></p>102 <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p> 104 103 </div> 105 104 106 105 <?php if ( $url != network_home_url('', 'http') ) : ?>