From 92e52d8df39efe958675e8abca7ecae1edb6bf80 Mon Sep 17 00:00:00 2001 From: "joe.lapp" <joe.lapp@pobox.com> Date: Thu, 15 Sep 2005 17:32:38 +0200 Subject: [PATCH] $conf['rss_linkto'] specifying default RSS feed linkto darcs-hash:20050915153238-36b45-6a10efcc6969713d3c2554ab610535ebae95aca1.gz --- conf/dokuwiki.php | 5 +++++ feed.php | 29 ++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 77b56fbc3..021c1d75c 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -75,6 +75,11 @@ $conf['im_convert'] = ''; //path to ImageMagicks convert (will be $conf['spellchecker']= 0; //enable Spellchecker (needs PHP >= 4.3.0 and aspell installed) $conf['subscribers'] = 0; //enable change notice subscription support $conf['pluginmanager'] = 0; //enable automated plugin management (requires plugin) +$conf['rss_linkto'] = 'diff'; //what page RSS entries link to: + // 'diff' - page showing revision differences + // 'page' - the revised page itself + // 'rev' - page showing all revisions + // 'current' - most recent revision of page //Set target to use when creating links - leave empty for same window $conf['target']['wiki'] = ''; diff --git a/feed.php b/feed.php index 537ae5e88..7bbfcdd17 100644 --- a/feed.php +++ b/feed.php @@ -110,17 +110,24 @@ function rssRecentChanges(&$rss,$num,$ltype,$ns){ } $desc = cleanDesc($xhtml); - - switch ($ltype){ - case 'page': - $item->link = wl($id,'rev='.$recents[$id]['date'],true); - break; - case 'rev': - $item->link = wl($id,'do=revisions&rev='.$recents[$id]['date'],true); - break; - default: - $item->link = wl($id,'do=diff&'.$recents[$id]['date'],true); - } + + if(empty($ltype)) + $ltype = $conf['rss_linkto']; + + switch ($ltype){ + case 'page': + $item->link = wl($id,'rev='.$recents[$id]['date'],true); + break; + case 'rev': + $item->link = wl($id,'do=revisions&rev='.$recents[$id]['date'],true); + break; + case 'current': + $item->link = wl($id, '', true); + break; + case 'diff': + default: + $item->link = wl($id,'do=diff&'.$recents[$id]['date'],true); + } $item->description = $desc; $item->date = date('r',$recents[$id]['date']); -- GitLab