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

Fix: Category feed showed all entries

Browse Source
This commit is contained in:
onli 2016-07-03 23:01:17 +02:00
parent 3aed0ac0f6
commit 84709381af
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/functions_routing.inc.php
View File

@ -292,7 +292,7 @@ function servePlugin($matches) {
serendipity_plugin_api::hook_event('external_plugin', $matches[2]); serendipity_plugin_api::hook_event('external_plugin', $matches[2]);
} }
function serveFeed() { function serveFeed($matches) {
global $serendipity; global $serendipity;
$serendipity['view'] = 'feed'; $serendipity['view'] = 'feed';
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
@ -301,7 +301,6 @@ function serveFeed() {
if (preg_match('@/(index|atom[0-9]*|rss|comments|trackbacks|comments_and_trackbacks|opml)\.(rss[0-9]?|rdf|rss|xml|atom)@', $uri, $vmatches)) { if (preg_match('@/(index|atom[0-9]*|rss|comments|trackbacks|comments_and_trackbacks|opml)\.(rss[0-9]?|rdf|rss|xml|atom)@', $uri, $vmatches)) {
list($_GET['version'], $_GET['type']) = serendipity_discover_rss($vmatches[1], $vmatches[2]); list($_GET['version'], $_GET['type']) = serendipity_discover_rss($vmatches[1], $vmatches[2]);
} }
if (is_array($matches)) { 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) { if (strpos($uriparts[2], $serendipity['permalinkCategoriesPath']) === 0) {

2
index.php
View File

@ -74,7 +74,7 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
isset($_GET['p'])) { isset($_GET['p'])) {
serveEntry($matches); serveEntry($matches);
} elseif (preg_match(PAT_PERMALINK_FEEDCATEGORIES, $uri, $matches) || preg_match(PAT_PERMALINK_FEEDAUTHORS, $uri, $matches) || preg_match(PAT_FEEDS, $uri)) { } elseif (preg_match(PAT_PERMALINK_FEEDCATEGORIES, $uri, $matches) || preg_match(PAT_PERMALINK_FEEDAUTHORS, $uri, $matches) || preg_match(PAT_FEEDS, $uri)) {
serveFeed(); serveFeed($matches);
exit; exit;
} else if (preg_match(PAT_PLUGIN, $uri, $matches)) { } else if (preg_match(PAT_PLUGIN, $uri, $matches)) {
servePlugin($matches); servePlugin($matches);