diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 02a7bbd8e4..d5b749ce38 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -360,10 +360,6 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { else unset($redirect['port']); - if ( ! empty( $user_home['scheme'] ) && $user_home['scheme'] === 'https' ) { - $redirect['scheme'] = 'https'; - } - // trailing /index.php $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']); @@ -421,7 +417,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { ( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) ) $redirect['host'] = $original['host']; - $compare_original = array( $original['scheme'], $original['host'], $original['path'] ); + $compare_original = array( $original['host'], $original['path'] ); if ( !empty( $original['port'] ) ) $compare_original[] = $original['port']; @@ -429,7 +425,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { if ( !empty( $original['query'] ) ) $compare_original[] = $original['query']; - $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] ); + $compare_redirect = array( $redirect['host'], $redirect['path'] ); if ( !empty( $redirect['port'] ) ) $compare_redirect[] = $redirect['port']; diff --git a/wp-includes/version.php b/wp-includes/version.php index 62a656ad6e..0478c1bcdb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30089'; +$wp_version = '4.1-alpha-30090'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.