WordPress.org

Make WordPress Core

Ticket #19723: 19723.patch

File 19723.patch, 1.2 KB (added by kurtpayne, 6 years ago)
  • wp-login.php

     
    1212require( dirname(__FILE__) . '/wp-load.php' );
    1313
    1414// Redirect to https login if forced to use SSL
    15 if ( force_ssl_admin() && !is_ssl() ) {
     15if ( ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ) {
    1616        if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
    1717                wp_redirect(preg_replace('|^http://|', 'https://', $_SERVER['REQUEST_URI']));
    1818                exit();
  • wp-includes/link-template.php

     
    19181918        if ( !in_array( $scheme, array( 'http', 'https' ) ) ) {
    19191919                if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
    19201920                        $scheme = 'https';
    1921                 elseif ( ( 'login' == $scheme ) && force_ssl_admin() )
     1921                elseif ( ( 'login' == $scheme ) && ( force_ssl_admin() || force_ssl_login() ) )
    19221922                        $scheme = 'https';
    19231923                elseif ( ( 'admin' == $scheme ) && force_ssl_admin() )
    19241924                        $scheme = 'https';