Fix global variable option setting in feeds.php.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@1590 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 4 insertions, 1 deletions

diff --git a/scripts/feeds.php b/scripts/feeds.php
index d9ea9d5a..1ebdcfc6 100644
--- a/scripts/feeds.php
+++ b/scripts/feeds.php
@@ -163,11 +163,13 @@ foreach(array_keys($FeedFmt) as $k) {
 
 function HandleFeed($pagename, $auth = 'read') {
   global $FeedFmt, $action, $PCache, $FmtV, $ISOTimeFmt, $RSSTimeFmt,
-    $FeedOpt, $FeedDescPatterns, $CategoryGroup, $EntitiesTable;
+    $FeedOpt, $FeedPageListOpt, $FeedCategoryOpt, $FeedTrailOpt,
+    $FeedDescPatterns, $CategoryGroup, $EntitiesTable;
   SDV($ISOTimeFmt, '%Y-%m-%dT%H:%M:%SZ');
   SDV($RSSTimeFmt, 'D, d M Y H:i:s \G\M\T');
   SDV($FeedDescPatterns, 
     array('/<[^>]*$/' => ' ', '/\\w+$/' => '', '/<[^>]+>/' => ''));
+  SDVA($FeedOpt, array());
   SDVA($FeedPageListOpt, array());
   SDVA($FeedCategoryOpt, array('link' => $pagename));
   SDVA($FeedTrailOpt, array('trail' => $pagename, 'count' => 10));
@@ -188,6 +190,7 @@ function HandleFeed($pagename, $auth = 'read') {
     PCache($pagename, $page); 
     $pagelist = array($pagename); 
   }
+  $opt = array_merge($opt, $FeedOpt);
   if (!$pagelist) {
     $opt = array_merge($opt, @$_REQUEST);
     $pagelist = MakePageList($pagename, $opt, 0);