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

Timestamp:

08/19/2008 03:21:12 AM (17 years ago)

Author:

markjaquith

Message:

Strip trailing spaces in URLs, redirect to canonical URL. fixes #7537

File:

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

trunk/wp-includes/canonical.php

@@ -154 +154 @@
     $redirect['path'] = preg_replace('|/index.php/$|', '/', $redirect['path']);
 
+    // Remove trailing spaces from the path
+    $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
+
+    // Remove trailing slashes from certain terminating query string args
+    $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+
+    // Clean up empty query strings
+    $redirect['query'] = preg_replace( '#&?(p|page_id|cat|tag)=?$#', '', $redirect['query'] );
+
     // strip /index.php/ when we're not using PATHINFO permalinks
     if ( !$wp_rewrite->using_index_permalinks() )