mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

implement patch by @fugue88

Browse Source 
References #199
This commit is contained in:
Garvin Hicking
2014-08-04 12:11:07 +02:00
parent 2217826e56
commit 938d7144c5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/NEWS
View File

@@ -3,7 +3,8 @@
Version 2.0-beta4 / RC? ()
------------------------------------------------------------------------
* Improve RegExp for Feed-URL matching, thanks to fugue88
Version 2.0-beta3 (July 25th, 2014)
------------------------------------------------------------------------

2
index.php
View File

@@ -334,7 +334,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
}
if (is_array($matches)) {
if (preg_match('@(/?' . preg_quote(PATH_FEEDS, '@') . '/)(.+)\.rss@i', $uri, $uriparts)) {
if (preg_match('@(/?' . preg_quote(PATH_FEEDS, '@') . '/)(.+?)(?:\.rss)?$@i', $uri, $uriparts)) {
if (strpos($uriparts[2], $serendipity['permalinkCategoriesPath']) === 0) {
$catid = serendipity_searchPermalink($serendipity['permalinkFeedCategoryStructure'], $uriparts[2], $matches[1], 'category');
if (is_numeric($catid) && $catid > 0) {