Merge remote-tracking branch 'origin/diff_navigation' into revisions

Conflicts:
	inc/parser/xhtml.php

1 files changed, 18 insertions, 17 deletions

diff --git a/feed.php b/feed.php
index b0699b1a2..7a6925d37 100644
--- a/feed.php
+++ b/feed.php
@@ -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;
 }