From 37350e873d7d0d3350c4286a0c7d028ffe49825a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:22:14 +0000
Subject: [PATCH] Make the feedlist work -- kinda

---
 actions/public.php |  1 +
 lib/feedlist.php   | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/actions/public.php b/actions/public.php
index 76e922dff1..62071ecccd 100644
--- 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 0ff88cb25a..9bc77ca15c 100644
--- 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: