Login: Use wp_safe_redirect() when redirecting the login page if forced to use HTTPS.

Merge of [42892] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42895


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2018-04-03 15:22:42 +00:00
parent 4c34006070
commit 076fb0ff4d
2 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.5-RC1-42885';
$wp_version = '4.9.5-RC1-42895';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

View File

@ -14,10 +14,10 @@ require( dirname(__FILE__) . '/wp-load.php' );
// Redirect to https login if forced to use SSL
if ( force_ssl_admin() && ! is_ssl() ) {
if ( 0 === strpos($_SERVER['REQUEST_URI'], 'http') ) {
wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
wp_safe_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
exit();
} else {
wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
wp_safe_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
exit();
}
}