Changes from trunk/wp-login.php at r21031 to branches/3.4/wp-login.php at r21136

File:

• branches/3.4/wp-login.php (modified) (4 diffs)

branches/3.4/wp-login.php

@@ -40 +40 @@
  */
 function login_header($title = 'Log In', $message = '', $wp_error = '') {
-        global $error, $interim_login, $current_site, $customize_login;
+        global $error, $interim_login, $current_site;
 
         // Don't index any of these forms
@@ -68 +68 @@
                 <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" /><?php
         }
-
-        if ( $customize_login )
-                wp_enqueue_script( 'customize-base' );
 
         do_action( 'login_enqueue_scripts' );
@@ -569 +566 @@
         $interim_login = isset($_REQUEST['interim-login']);
         $customize_login = isset( $_REQUEST['customize-login'] );
+        if ( $customize_login )
+                wp_enqueue_script( 'customize-base' );
 
         // If the user wants ssl but the session is not ssl, force a secure cookie.
@@ -605 +604 @@
                 if ( $interim_login ) {
                         $message = '<p class="message">' . __('You have logged in successfully.') . '</p>';
-                        login_header( '', $message );
-
-                        if ( ! $customize_login ) : ?>
-                                <script type="text/javascript">setTimeout( function(){window.close()}, 8000);</script>
-                                <p class="alignright">
-                                <input type="button" class="button-primary" value="<?php esc_attr_e('Close'); ?>" onclick="window.close()" /></p>
-<?php           endif;
-
-                        ?></div><?php
-
-                        do_action('login_footer');
-
-                        if ( $customize_login ) : ?>
+                        login_header( '', $message ); ?>
+
+                        <?php if ( ! $customize_login ) : ?>
+                        <script type="text/javascript">setTimeout( function(){window.close()}, 8000);</script>
+                        <p class="alignright">
+                        <input type="button" class="button-primary" value="<?php esc_attr_e('Close'); ?>" onclick="window.close()" /></p>
+                        <?php endif; ?>
+                        </div>
+                        <?php do_action( 'login_footer' ); ?>
+                        <?php if ( $customize_login ) : ?>
                                 <script type="text/javascript">setTimeout( function(){ new wp.customize.Messenger({ url: '<?php echo wp_customize_url(); ?>', channel: 'login' }).send('login') }, 1000 );</script>
-<?php           endif; ?>
+                        <?php endif; ?>
                         </body></html>
 <?php           exit;