Make the feedlist work -- kinda

diff --git a/actions/public.php b/actions/public.php
index 76e922dff1efea0cc734d46df741f0029c27c5f0..62071ecccd471ede5e5b1f1aaef793c73088ce40 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -33,6 +33,7 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/publicgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
 /**
  * Action for displaying the public stream

diff --git a/lib/feedlist.php b/lib/feedlist.php
index 0ff88cb25ab3b2865199363aa65fc6a240ab5b4e..9bc77ca15c44c264223baf36dad526e4c3d6b54c 100644 (file)
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -47,13 +47,14 @@ if (!defined('LACONICA')) {
  * @see      Action::showExportList()
  */
 
-class FeedList
+class FeedList extends Widget
 {
-    var $out = null;
-
-    function __construct($out=null)
+    var $action = null;
+    
+    function __construct($action=null)
     {
-        $this->out = $out;
+       parent::__construct($action);
+       $this->action = $action;
     }
 
     function show($feeds)
@@ -72,7 +73,7 @@ class FeedList
 
     function feedItem($feed)
     {
-        $nickname = $this->trimmed('nickname');
+        $nickname = $this->action->trimmed('nickname');
 
         switch($feed['item']) {
          case 'notices': default: