Ticket #7537: trailing-spaces-canonical.diff

wp-includes/query.php

@@ -524 +524 @@
                 $qv['w'] = absint($qv['w']);
                 $qv['m'] = absint($qv['m']);
                 $qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
+                $qv['pagename'] = trim( $qv['pagename'] );
+                $qv['name'] = trim( $qv['name'] );
                 if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
                 if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
                 if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);

wp-includes/canonical.php

@@ -153 +153 @@
         // trailing /index.php/
         $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() )
                 $redirect['path'] = str_replace('/index.php/', '/', $redirect['path']);