redirect_canonical doesn't strip off custom feed endings

[huyby]

The pattern used for matching URL's with feed endings (e.g. /feed/atom/) isn't matching any custom defined feeds. For example, if you add 'json' as a new type of feed, the redirect_canonical function adds up the feed ending to the current request URL.

This is caused by fixed regular expressions used to match such feed URL's. These regular expressions should be generated using the $wp_rewrite->feeds variable:

 $feedssubpattern = implode('|', array_map(function($val) { return preg_quote($val, '#'); }, $wp_rewrite->feeds));
 $pattern = '#/(comments/?)?(' . $feedssubpattern . ')(/+)?$#';

[huyby]

patch

[johnbillion]

Thanks for the report and the patch, @huyby!

It looks like your command line is piped through something that adds colour coding, and the markings for this are present in your patch file. Are you able to regenerate your patch without the colour coding in place please?

[huyby]

Patch, no color codes this time :)

[huyby]

Done! I also noticed I left a debug line uncommented, it was commented before, so fixed that and removed from the patch.

cheers

s.