Ticket #8642: canonical.diff

canonical.php

@@ -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('#/(feed|rss2?|rdf|atom)/#', '/', $paged_redirect['path']); // strip off feed in middle
+
                                 $paged_redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing comment paging
                         }