Merge remote-tracking branch 'origin/master' into video-audio

Conflicts:
	inc/parser/xhtml.php

1 files changed, 15 insertions, 12 deletions

diff --git a/feed.php b/feed.php
index 8d1dcea6a..77c8b28df 100644
--- a/feed.php
+++ b/feed.php
@@ -429,19 +429,22 @@ function rss_buildItems(&$rss, &$data, $opt) {
                 $cat = getNS($id);
                 if($cat) $item->category = $cat;
             }
-
-            // 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);
+           
+            // 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
             }
-            $evt->advise_after(); // for completeness
         }
     }
     $event->advise_after();