Merge remote branch 'origin/master' into sitemap

1 files changed, 0 insertions, 5 deletions

diff --git a/feed.php b/feed.php
index 50786dd3a..0980dfaa8 100644
--- a/feed.php
+++ b/feed.php
@@ -248,7 +248,6 @@ function rss_buildItems(&$rss,&$data,$opt){
 
             // add user
             # FIXME should the user be pulled from metadata as well?
-            $user = null;
             $user = @$ditem['user']; // the @ spares time repeating lookup
             $item->author = '';
             if($user && $conf['useacl'] && $auth){
@@ -309,9 +308,6 @@ function rss_buildItems(&$rss,&$data,$opt){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function rssRecentChanges($opt){
-    global $conf;
-    global $auth;
-
     $flags = RECENTS_SKIP_DELETED;
     if(!$opt['show_minor']) $flags += RECENTS_SKIP_MINORS;
 
@@ -347,7 +343,6 @@ function rssSearch($opt){
     if(!$opt['search_query']) return;
 
     require_once(DOKU_INC.'inc/fulltext.php');
-    $data = array();
     $data = ft_pageSearch($opt['search_query'],$poswords);
     $data = array_keys($data);