Ticket #19723: 19723.patch

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_admin() || force_ssl_login() ) && !is_ssl() ) {
         if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
                 wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
                 exit();

wp-includes/link-template.php

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