Changes from branches/4.0/src/wp-includes/canonical.php at r30253 to trunk/src/wp-includes/canonical.php at r29663

File:

• trunk/src/wp-includes/canonical.php (modified) (3 diffs)

trunk/src/wp-includes/canonical.php

@@ -361 +361 @@
         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']);
@@ -418 +422 @@
         $redirect['host'] = $original['host'];
 
-    $compare_original = array( $original['host'], $original['path'] );
+    $compare_original = array( $original['scheme'], $original['host'], $original['path'] );
 
     if ( !empty( $original['port'] ) )
@@ -426 +430 @@
         $compare_original[] = $original['query'];
 
-    $compare_redirect = array( $redirect['host'], $redirect['path'] );
+    $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] );
 
     if ( !empty( $redirect['port'] ) )