From e6507a0f180bfe70d36599c4c269eb3b08b9f61d Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 23 Jun 2015 12:26:44 +0200
Subject: [PATCH] FeedList widget had mismatching show() definition

---
 lib/action.php   | 22 +++++++++-------------
 lib/feedlist.php | 23 ++++++++++++-----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index fa91d46726..29fadbf883 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -534,15 +534,11 @@ class Action extends HTMLOutputter // lawsuit
      */
     function showFeeds()
     {
-        $feeds = $this->getFeeds();
-
-        if ($feeds) {
-            foreach ($feeds as $feed) {
-                $this->element('link', array('rel' => $feed->rel(),
-                                             'href' => $feed->url,
-                                             'type' => $feed->mimeType(),
-                                             'title' => $feed->title));
-            }
+        foreach ($this->getFeeds() as $feed) {
+            $this->element('link', array('rel' => $feed->rel(),
+                                         'href' => $feed->url,
+                                         'type' => $feed->mimeType(),
+                                         'title' => $feed->title));
         }
     }
 
@@ -1035,9 +1031,9 @@ class Action extends HTMLOutputter // lawsuit
     function showExportData()
     {
         $feeds = $this->getFeeds();
-        if ($feeds) {
-            $fl = new FeedList($this);
-            $fl->show($feeds);
+        if (!empty($feeds)) {
+            $fl = new FeedList($this, $feeds);
+            $fl->show();
         }
     }
 
@@ -1658,7 +1654,7 @@ class Action extends HTMLOutputter // lawsuit
      */
     function getFeeds()
     {
-        return null;
+        return array();
     }
 
     /**
diff --git a/lib/feedlist.php b/lib/feedlist.php
index c57f377238..cc0f552493 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -28,9 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Widget for showing a list of feeds
@@ -50,30 +48,33 @@ class FeedList extends Widget
 {
     var $action = null;
 
-    function __construct($action=null)
+    protected $feeds = null;
+
+    public function __construct(Action $action=null, array $feeds=array())
     {
-	parent::__construct($action);
-	$this->action = $action;
+        parent::__construct($action);
+        $this->action = $action;
+        $this->feeds  = $feeds;
     }
 
-    function show($feeds)
+    public function show()
     {
-        if (Event::handle('StartShowFeedLinkList', array($this->action, &$feeds))) {
-            if (!empty($feeds)) {
+        if (Event::handle('StartShowFeedLinkList', array($this->action, &$this->feeds))) {
+            if (!empty($this->feeds)) {
                 $this->out->elementStart('div', array('id' => 'export_data',
                                                       'class' => 'section'));
                 // TRANS: Header for feed links (h2).
                 $this->out->element('h2', null, _('Feeds'));
                 $this->out->elementStart('ul', array('class' => 'xoxo'));
 
-                foreach ($feeds as $feed) {
+                foreach ($this->feeds as $feed) {
                     $this->feedItem($feed);
                 }
 
                 $this->out->elementEnd('ul');
                 $this->out->elementEnd('div');
             }
-            Event::handle('EndShowFeedLinkList', array($this->action, &$feeds));
+            Event::handle('EndShowFeedLinkList', array($this->action, &$this->feeds));
         }
     }
 
-- 
2.39.5