Changeset 8589 for trunk/wp-includes/canonical.php

Timestamp:

08/08/2008 05:05:10 PM (17 years ago)

Author:

westi

Message:

Lots of fixes for Notices when WP_DEBUG is set. See #6669 props santosj.

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

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