Changeset 10506

Timestamp:

02/04/2009 11:07:57 PM (16 years ago)

Author:

markjaquith

Message:

Strip /feed/ endings even if they are not at the very end, in canonical. props jhodgdon. fixes #8642 for 2.7

File:

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

branches/2.7/wp-includes/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('#/(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
             }