From 2f1faf4976459076277ef549b2b235cab2593095 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 17 Jul 2007 17:20:00 +0200 Subject: some feed fixes darcs-hash:20070717152000-7ad00-cf80f04e5d4e1923c3de0975b8e5ae2521898bf9.gz --- feed.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'feed.php') diff --git a/feed.php b/feed.php index 7df3a0ff7..db10cc3e6 100644 --- a/feed.php +++ b/feed.php @@ -23,7 +23,7 @@ // the feed is dynamic - we need a cache for each combo // (but most people just use the default feed so it's still effective) - $cache = getCacheName(array_values($opt).$_SERVER['REMOTE_USER'],'.feed'); + $cache = getCacheName(join('',array_values($opt)).$_SERVER['REMOTE_USER'],'.feed'); $cmod = @filemtime($cache); // 0 if not exists if ($cmod && (@filemtime(DOKU_CONF.'local.php')>$cmod || @filemtime(DOKU_CONF.'dokuwiki.php')>$cmod)) { // ignore cache if feed prefs may have changed @@ -58,7 +58,7 @@ $rss->image = $image; if($opt['feed_mode'] == 'list'){ - rssListNamespace($rss,$ns); + rssListNamespace($rss,$opt); }else{ rssRecentChanges($rss,$opt); } @@ -89,9 +89,10 @@ function rss_parseOptions(){ $opt['link_to'] = $_REQUEST['linkto']; $opt['item_content'] = $_REQUEST['content']; - if($opt['feed_type'] == '') $opt['feed_type'] = $conf['rss_type']; - if($opt['item_content'] == '') $opt['item_content'] = $conf['rss_content']; - if(!$opt['items']) $opt['items'] = $conf['recent']; + if(!$opt['feed_type']) $opt['feed_type'] = $conf['rss_type']; + if(!$opt['item_content']) $opt['item_content'] = $conf['rss_content']; + if(!$opt['link_to']) $opt['link_to'] = $conf['rss_linkto']; + if(!$opt['items']) $opt['items'] = $conf['recent']; $opt['guardmail'] = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none'); switch ($opt['feed_type']){ -- cgit v1.2.3