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

Honor https in home option. 

fixes #20759


git-svn-id: http://core.svn.wordpress.org/trunk@21937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-09-21 12:36:50 +00:00
parent 2fcdb3395d
commit a8fa7b3ad2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1892,9 +1892,6 @@ function home_url( $path = '', $scheme = null ) {
function get_home_url( $blog_id = null, $path = '', $scheme = null ) { function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
$orig_scheme = $scheme; $orig_scheme = $scheme;
if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
$scheme = is_ssl() && !is_admin() ? 'https' : 'http';
if ( empty( $blog_id ) || !is_multisite() ) { if ( empty( $blog_id ) || !is_multisite() ) {
$url = get_option( 'home' ); $url = get_option( 'home' );
} else { } else {
@ -1903,6 +1900,13 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
restore_current_blog(); restore_current_blog();
} }
if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
if ( is_ssl() && ! is_admin() )
$scheme = 'https';
else
$scheme = parse_url( $url, PHP_URL_SCHEME );
}
$url = set_url_scheme( $url, $scheme ); $url = set_url_scheme( $url, $scheme );
if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false ) if ( ! empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )