Changeset 9642

Timestamp:

11/12/2008 08:09:16 PM (16 years ago)

Author:

markjaquith

Message:

Be more picky about the trailing blank query string things we strip. props filosofo, fitztrev, stevish, azaozz, DD32 (go team!). fixes #8098. fixes #8180

File:

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

trunk/wp-includes/canonical.php

@@ -201 +201 @@
 
     if ( !empty( $redirect['query'] ) ) {
-        // Remove trailing slashes from certain terminating query string args
+        // Remove trailing spaces 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'] );
+        $redirect['query'] = preg_replace( '#(^\??|&)(p|page_id|cat|tag)=?$#', '', $redirect['query'] );
+
+        // Remove redundant leading ampersands
+        $redirect['query'] = preg_replace( '#^\??&+#', '', $redirect['query'] );
     }