Ticket #6977: 6977_fix.patch

wp-includes/canonical.php

@@ -179 +179 @@
         if ( strtolower($original['host']) == strtolower($redirect['host']) )
                 $redirect['host'] = $original['host'];
 
-        if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) {
+        if ( array($original['host'], @$original['port'], $original['path'], @$original['query']) 
+                !== array($redirect['host'], @$redirect['port'], $redirect['path'], @$redirect['query']) ) {
                 $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
                 if ( isset($redirect['port']) )
                         $redirect_url .= ':' . $redirect['port'];