Changeset 6112

Timestamp:

09/13/2007 07:24:05 PM (18 years ago)

Author:

markjaquith

Message:

Handle ports for canonical redirects. Props driverkt and westi. fixes #4970

File:

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

trunk/wp-includes/canonical.php

@@ -106 +106 @@
     $redirect['host'] = $user_home['host'];
 
+    // Handle ports
+    if ( isset($user_home['port']) )
+        $redirect['port'] = $user_home['port'];
+    else
+        unset($redirect['port']);
+
     // trailing /index.php or /index.php/
     $redirect['path'] = preg_replace('|/index.php/?$|', '/', $redirect['path']);
@@ -137 +143 @@
         $redirect['host'] = $original['host'];
 
-    if ( array($original['host'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['path'], $redirect['query']) ) {
-        $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
+    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'];
+        $redirect_url .= $redirect['path'];
         if ( $redirect['query'] )
             $redirect_url .= '?' . $redirect['query'];