We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 4f56d984 authored by sarven's avatar sarven

Merge branch 'uiredesign' of ../evan into uiredesign

parents c4462b15 37350e87
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment