Ticket #27954: 27954.diff

wp-includes/canonical.php

@@ -387 +387 @@
                 $redirect['port'] = $user_home['port'];
         else
                 unset($redirect['port']);
+        
+        // Redirect to HTTPS if the FORCE_SSL constant is set to true
+        if ( defined( 'FORCE_SSL' ) && FORCE_SSL )
+                $redirect['scheme'] = 'https';
 
         // trailing /index.php
         $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
@@ -445 +449 @@
                 ( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
                 $redirect['host'] = $original['host'];
 
-        $compare_original = array( $original['host'], $original['path'] );
+        $compare_original = array( $original['scheme'], $original['host'], $original['path'] );
 
         if ( !empty( $original['port'] ) )
                 $compare_original[] = $original['port'];
@@ -453 +457 @@
         if ( !empty( $original['query'] ) )
                 $compare_original[] = $original['query'];
 
-        $compare_redirect = array( $redirect['host'], $redirect['path'] );
+        $compare_redirect = array( $redirect['scheme'], $redirect['host'], $redirect['path'] );
 
         if ( !empty( $redirect['port'] ) )
                 $compare_redirect[] = $redirect['port'];