Changes from trunk/wp-includes/canonical.php at r9883 to branches/2.7/wp-includes/canonical.php at r10506

File:

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

branches/2.7/wp-includes/canonical.php

@@ -120 +120 @@
             if ( $redirect_url = get_year_link(get_query_var('year')) )
                 $redirect['query'] = remove_query_arg('year', $redirect['query']);
-        } elseif ( is_category() && !empty($_GET['cat']) ) {
+        } elseif ( is_category() && !empty($_GET['cat']) && preg_match( '|^[0-9]+$|', $_GET['cat'] ) ) {
             if ( $redirect_url = get_category_link(get_query_var('cat')) )
                 $redirect['query'] = remove_query_arg('cat', $redirect['query']);
@@ -137 +137 @@
                 // Strip off paging and feed
                 $paged_redirect['path'] = preg_replace('#/page/[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing paging
-                $paged_redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+)?$#', '/', $paged_redirect['path']); // strip off feed endings
+                $paged_redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $paged_redirect['path']); // strip off feed endings
                 $paged_redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing comment paging
             }