GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
sarven 2009-01-15 20:24:28 +00:00
parent c4462b152a 37350e873d
commit 4f56d98415
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actions/public.php
View File

@ -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

13
lib/feedlist.php
View File

@ -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: