Changeset 28609 for trunk/src/wp-includes/functions.php

Timestamp:

05/29/2014 03:58:41 AM (11 years ago)

Author:

nacin

Message:

Forcing SSL logins now forces SSL for the entire admin, with no middle ground.

fixes #10267.

File:

• trunk/src/wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -3388 +3388 @@
  */
 function force_ssl_login( $force = null ) {
-    static $forced = false;
-
-    if ( !is_null( $force ) ) {
-        $old_forced = $forced;
-        $forced = $force;
-        return $old_forced;
-    }
-
-    return $forced;
+    return force_ssl_admin( $force );
 }
 
@@ -4306 +4298 @@
     $same_domain = ( strpos( $login_url, $current_domain ) === 0 );
 
-    if ( $same_domain && force_ssl_login() && ! force_ssl_admin() )
-        $same_domain = false;
-
     /**
      * Filter whether the authentication check originated at the same domain.