diff options
author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 15:10:15 +0100 |
---|---|---|
committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-02-15 15:10:15 +0100 |
commit | 2643fc174cfce2c89b096e1aa28b8433c1bd9088 (patch) | |
tree | 4219fa16c1e196fca55429092494051eb899891c /feed.php | |
parent | 1da8dc976a4e9184fe550789a77d8e5cb866926f (diff) | |
parent | 0ba750c06b51626ccace39f0f6be7062eebb0a40 (diff) | |
download | rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.gz rpg-2643fc174cfce2c89b096e1aa28b8433c1bd9088.tar.bz2 |
Merge remote-tracking branch 'origin/master' into diff_navigation
Diffstat (limited to 'feed.php')
-rw-r--r-- | feed.php | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -431,22 +431,19 @@ function rss_buildItems(&$rss, &$data, $opt) { $cat = getNS($id); if($cat) $item->category = $cat; } - - // Add only visible items - if(isVisiblePage($id)) { - // finally add the item to the feed object, after handing it to registered plugins - $evdata = array( - 'item' => &$item, - 'opt' => &$opt, - 'ditem' => &$ditem, - 'rss' => &$rss - ); - $evt = new Doku_Event('FEED_ITEM_ADD', $evdata); - if($evt->advise_before()) { - $rss->addItem($item); - } - $evt->advise_after(); // for completeness + + // finally add the item to the feed object, after handing it to registered plugins + $evdata = array( + 'item' => &$item, + 'opt' => &$opt, + 'ditem' => &$ditem, + 'rss' => &$rss + ); + $evt = new Doku_Event('FEED_ITEM_ADD', $evdata); + if($evt->advise_before()) { + $rss->addItem($item); } + $evt->advise_after(); // for completeness } } $event->advise_after(); @@ -481,8 +478,12 @@ function rssListNamespace($opt) { $ns = str_replace(':', '/', $ns); $data = array(); - sort($data); - search($data, $conf['datadir'], 'search_list', '', $ns); + $search_opts = array( + 'depth' => 1, + 'pagesonly' => true, + 'listfiles' => true + ); + search($data, $conf['datadir'], 'search_universal', $search_opts, $ns); return $data; } |