Ticket #10267: 10267.diff

wp-login.php

@@ -12 +12 @@
 require( dirname(__FILE__) . '/wp-load.php' );
 
 // Redirect to https login if forced to use SSL
-if ( force_ssl_admin() && !is_ssl() ) {
+if ( ( force_ssl_login() || force_ssl_admin() ) && !is_ssl() ) {
         if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
                 wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
                 exit();

wp-includes/link-template.php

@@ -1695 +1695 @@
         if ( !in_array($scheme, array('http', 'https')) ) {
                 if ( ('login_post' == $scheme) && ( force_ssl_login() || force_ssl_admin() ) )
                         $scheme = 'https';
-                elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
+                elseif ( ('login' == $scheme) && ( force_ssl_login() || force_ssl_admin() ) )
                         $scheme = 'https';
                 elseif ( ('admin' == $scheme) && force_ssl_admin() )
                         $scheme = 'https';