Changeset 28396 for trunk/src/wp-admin/install.php

Timestamp:

05/14/2014 04:42:42 PM (11 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in display_setup_form(). Only needs to read password and password_message.

See #22400.

File:

• trunk/src/wp-admin/install.php (modified) (2 diffs)

trunk/src/wp-admin/install.php

@@ -218 +218 @@
         if ( $error === false ) {
             $wpdb->show_errors();
-            $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ) );
-            extract( $result, EXTR_SKIP );
+            $result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ) );
 ?>
 
@@ -234 +233 @@
         <th><?php _e( 'Password' ); ?></th>
         <td><?php
-        if ( ! empty( $password ) && empty($admin_password_check) )
-            echo '<code>'. esc_html($password) .'</code><br />';
-        echo "<p>$password_message</p>"; ?>
+        if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
+            <code><?php echo esc_html( $result['password'] ) ?></code><br />
+        <?php endif ?>
+            <p><?php echo $result['password_message'] ?></p>
         </td>
     </tr>