From 44f1166462c9d88a7674dae646f009cc49b8a1d1 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 1 Dec 2013 23:47:04 +0100
Subject: Revert "fix indention of RSS patch"

This reverts commit a010fc32a9c11bfbe8a82ad55fdec134d2476306.
---
 feed.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index 77c8b28df..2deeea227 100644
--- a/feed.php
+++ b/feed.php
@@ -430,21 +430,21 @@ function rss_buildItems(&$rss, &$data, $opt) {
                 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
+           // 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
+           }
         }
     }
     $event->advise_after();
-- 
cgit v1.2.3


From 11540fc12046d12078bd8a41bb5e1a72d53d515d Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 1 Dec 2013 23:47:15 +0100
Subject: Revert "Exclude hidden pages (config["hidepages"]) from RSS feed (see
 https://www.dokuwiki.org/config:hidepages)"

This reverts commit f5151bdbf999043dfe1ba73a684d37b27ff6e021.
---
 feed.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index 2deeea227..8d1dcea6a 100644
--- a/feed.php
+++ b/feed.php
@@ -429,9 +429,7 @@ 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,
@@ -444,7 +442,6 @@ function rss_buildItems(&$rss, &$data, $opt) {
                 $rss->addItem($item);
             }
             $evt->advise_after(); // for completeness
-           }
         }
     }
     $event->advise_after();
-- 
cgit v1.2.3


From 0b4e20cc13eaadaee104a8815403ac749e3a49fa Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Mon, 2 Dec 2013 00:12:49 +0100
Subject: Fix RSS namespace listings containing hidden pages

---
 feed.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'feed.php')

diff --git a/feed.php b/feed.php
index 8d1dcea6a..bdce666d2 100644
--- a/feed.php
+++ b/feed.php
@@ -476,8 +476,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;
 }
-- 
cgit v1.2.3