WordPress 4.0.1

[autoinstallsdev/wordpress.git] / wp-includes / canonical.php

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index c1b90251cf2fd211e9b0caabffad6f50630465e8..42e02d9de65131462f04e1182fc4e77e74177fd0 100644 (file)
--- 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'];