diff options
| author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 20:24:28 +0000 |
|---|---|---|
| committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 20:24:28 +0000 |
| commit | 4f56d984154e283db8030a19441318d927fa82bc (patch) | |
| tree | 3cc72937c08d3501822d1e3658ea6d05a1bc48ec | |
| parent | c4462b152af09e6af254f8bb00d06554b2994689 (diff) | |
| parent | 37350e873d7d0d3350c4286a0c7d028ffe49825a (diff) | |
Merge branch 'uiredesign' of ../evan into uiredesign
| -rw-r--r-- | actions/public.php | 1 | ||||
| -rw-r--r-- | lib/feedlist.php | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/actions/public.php b/actions/public.php index 76e922dff..62071eccc 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 0ff88cb25..9bc77ca15 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: |