Ticket #11700: 11700.patch

wp-includes/canonical.php

@@ -262 +262 @@
 
         $compare_original = array($original['host'], $original['path']);
 
-        if ( !empty( $original['port'] ) )
+        if ( !empty( $original['port'] ) && $original['port'] != 80 )
                 $compare_original[] = $original['port'];
 
         if ( !empty( $original['query'] ) )
@@ -285 +285 @@
                         $redirect_url .= '?' . $redirect['query'];
         }
 
-        if ( $redirect_url == $requested_url )
+        if ( !$redirect_url || $redirect_url == $requested_url )
                 return false;
 
         // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE