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

Timestamp:

09/11/2007 09:21:40 PM (17 years ago)

Author:

markjaquith

Message:

Always trailingslash the "home" URL. Protect against chained redirects. Thanks wantmoore. fixes #4773

File:

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

trunk/wp-includes/canonical.php

@@ -2 +2 @@
 // Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference" by Mark Jaquith
 
-function redirect_canonical() {
+function redirect_canonical($requested_url=NULL, $do_redirect=true) {
     global $wp_rewrite, $posts, $is_IIS;
 
@@ -8 +8 @@
         return;
 
-    // build the URL in the address bar
-    $requested_url  = ( isset($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
-    $requested_url .= $_SERVER['HTTP_HOST'];
-    $requested_url .= $_SERVER['REQUEST_URI'];
+    if ( !$requested_url ) {
+        // build the URL in the address bar
+        $requested_url  = ( isset($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+        $requested_url .= $_SERVER['HTTP_HOST'];
+        $requested_url .= $_SERVER['REQUEST_URI'];
+    }
 
     $original = @parse_url($requested_url);
@@ -127 +129 @@
     }
 
+    // Always trailing slash the 'home' URL
+    if ( $redirect['path'] == $user_home['path'] )
+        $redirect['path'] = trailingslashit($redirect['path']);
+
     if ( array($original['host'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['path'], $redirect['query']) ) {
         $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
@@ -136 +142 @@
         // var_dump($redirect_url); die();
         $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
-        wp_redirect($redirect_url, 301);
-        exit();
+        if ( $do_redirect) {
+            // protect against chained redirects
+            if ( !redirect_canonical($redirect_url, false) ) {
+                wp_redirect($redirect_url, 301);
+                exit();
+            } else {
+                return false;
+            }
+        } else {
+            return $redirect_url;
+        }
+    } else {
+        return false;
     }
 }