Changeset 24266

Timestamp:

05/15/2013 10:09:54 PM (13 years ago)

Author:

azaozz

Message:

Logged out warnings: fix same domain comparison in wp_auth_check_html() when FORCE_SSL_LOGIN && ! FORCE_SSL_ADMIN. See #23295

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3922 +3922 @@
  */
 function wp_auth_check_html() {
-    $login_url = site_url( 'wp-login.php', 'login_post' );
+    $login_url = wp_login_url();
     $current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
     $same_domain = ( strpos( $login_url, $current_domain ) === 0 );
+
+    if ( $same_domain && force_ssl_login() && ! force_ssl_admin() )
+        $same_domain = false;
 
     // Let plugins change this if they know better.