Changeset 28609 for trunk/src/wp-includes/link-template.php

Timestamp:

05/29/2014 03:58:41 AM (10 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/link-template.php (modified) (1 diff)

trunk/src/wp-includes/link-template.php

@@ -2846 +2846 @@
 function set_url_scheme( $url, $scheme = null ) {
     $orig_scheme = $scheme;
-    if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-        if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
-            $scheme = 'https';
-        elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
-            $scheme = 'https';
-        elseif ( ( 'admin' == $scheme ) && force_ssl_admin() )
-            $scheme = 'https';
-        else
-            $scheme = ( is_ssl() ? 'https' : 'http' );
+
+    if ( ! $scheme ) {
+        $scheme = is_ssl() ? 'https' : 'http';
+    } elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+        $scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
+    } elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+        $scheme = is_ssl() ? 'https' : 'http';
     }