WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If wp-login.php is accessed over HTTPS, get_home_url() should not return HTTPS. This is the same assumption we use in the admin. 

props willnorris.
fixes #16822.



git-svn-id: http://core.svn.wordpress.org/trunk@24844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-07-29 01:21:27 +00:00
parent c61a2dac03
commit edc0882d2f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/link-template.php
View File

@ -1913,7 +1913,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
} }
if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) { if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
if ( is_ssl() && ! is_admin() ) if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] )
$scheme = 'https'; $scheme = 'https';
else else
$scheme = parse_url( $url, PHP_URL_SCHEME ); $scheme = parse_url( $url, PHP_URL_SCHEME );