diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php index 9b576f4cf..290453d89 100644 --- a/conf/dokuwiki.php +++ b/conf/dokuwiki.php @@ -136,6 +136,7 @@ $conf['rss_media'] = 'both'; //what should be listed? // 'media' - media changes only $conf['rss_update'] = 5*60; //Update the RSS feed every n seconds (defaults to 5 minutes) $conf['rss_show_summary'] = 1; //Add revision summary to title? 0|1 +$conf['rss_show_deleted'] = 1; //Show deleted items 0|1 /* Advanced Settings */ $conf['updatecheck'] = 1; //automatically check for new releases? diff --git a/feed.php b/feed.php index de5887e6d..2925c3ee7 100644 --- a/feed.php +++ b/feed.php @@ -466,7 +466,8 @@ function rss_buildItems(&$rss, &$data, $opt) { */ function rssRecentChanges($opt) { global $conf; - $flags = RECENTS_SKIP_DELETED; + //$flags = RECENTS_SKIP_DELETED; + if(!$conf['rss_show_deleted']) $flags = RECENTS_SKIP_DELETED; if(!$opt['show_minor']) $flags += RECENTS_SKIP_MINORS; if($opt['content_type'] == 'media' && $conf['mediarevisions']) $flags += RECENTS_MEDIA_CHANGES; if($opt['content_type'] == 'both' && $conf['mediarevisions']) $flags += RECENTS_MEDIA_PAGES_MIXED; diff --git a/lib/plugins/config/lang/en/lang.php b/lib/plugins/config/lang/en/lang.php index 3a408e0e3..fb8186cd8 100644 --- a/lib/plugins/config/lang/en/lang.php +++ b/lib/plugins/config/lang/en/lang.php @@ -155,6 +155,7 @@ $lang['rss_linkto'] = 'XML feed links to'; $lang['rss_content'] = 'What to display in the XML feed items?'; $lang['rss_update'] = 'XML feed update interval (sec)'; $lang['rss_show_summary'] = 'XML feed show summary in title'; +$lang['rss_show_deleted'] = 'XML feed Show deleted feeds'; $lang['rss_media'] = 'What kind of changes should be listed in the XML feed?'; $lang['rss_media_o_both'] = 'both'; $lang['rss_media_o_pages'] = 'pages'; diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index cd818cb88..6fdd64d6e 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -208,6 +208,7 @@ $meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff' $meta['rss_media'] = array('multichoice','_choices' => array('both','pages','media')); $meta['rss_update'] = array('numeric'); $meta['rss_show_summary'] = array('onoff'); +$meta['rss_show_deleted'] = array('onoff'); $meta['_advanced'] = array('fieldset'); $meta['updatecheck'] = array('onoff');