Changeset 24208

Timestamp:

05/08/2013 10:45:58 PM (11 years ago)

Author:

azaozz

Message:

Logged out warnings:

• Don't use <base> tag to set target="_blank". It can break form submission. Instead, set target only on links with JS.
• Fix same domain comparison in wp_auth_check_html() when FORCE_SSL_LOGIN == true.
• Properly show/hide the "Close" button when the dialog is shown multiple times.

See #23295

Location:

trunk

Files:

• wp-includes/functions.php (modified) (1 diff)
• wp-includes/js/wp-auth-check.js (modified) (1 diff)
• wp-login.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -3922 +3922 @@
  */
 function wp_auth_check_html() {
-    $login_url = wp_login_url();
+    $login_url = site_url( 'wp-login.php', 'login_post' );
     $current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
     $same_domain = ( strpos( $login_url, $current_domain ) === 0 );

trunk/wp-includes/js/wp-auth-check.js

@@ -65 +65 @@
 
         wrap.fadeOut( 200, function() {
-            wrap.addClass('hidden').css('display', '');
+            wrap.addClass('hidden').css('display', '').find('.wp-auth-check-close').css('display', '');
             $('#wp-auth-check-frame').remove();
         });

trunk/wp-login.php

@@ -101 +101 @@
         ?>
         <style type="text/css">html{background-color: transparent;}</style>
-        <base target="_blank">
         <?php
 
@@ -664 +663 @@
         $errors->add('test_cookie', __("<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href='http://www.google.com/cookies.html'>enable cookies</a> to use WordPress."));
 
-    $form_target = '';
     if ( $interim_login ) {
-        $form_target = ' target="_self"';
         if ( ! $errors->get_error_code() )
             $errors->add('expired', __('Session expired. Please log in again. You will not move away from this page.'), 'message');
@@ -698 +695 @@
 ?>
 
-<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post"<?php echo $form_target; ?>>
+<form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
     <p>
         <label for="user_login"><?php _e('Username') ?><br />
@@ -758 +755 @@
 <?php } ?>
 if(typeof wpOnload=='function')wpOnload();
+<?php if ( $interim_login ) { ?>
+(function(){
+try {
+    var i, links = document.getElementsByTagName('a');
+    for ( i in links ) {
+        if ( links[i].href )
+            links[i].target = '_blank';
+    }
+} catch(e){}
+}());
+<?php } ?>
 </script>