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

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

This commit is contained in:
Sarven Capadisli 2009-07-01 20:59:49 +00:00
parent c832888234 90557e9147
commit b8d32a5118
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/conversation.php
View File

@ -107,7 +107,7 @@ class ConversationAction extends Action
function showContent()
{
$notices = Notice::conversationStream($this->id);
$notices = Notice::conversationStream($this->id, 0, null);
$ct = new ConversationTree($notices, $this);
@ -140,9 +140,7 @@ class ConversationTree extends NoticeList
function show()
{
$cnt = 0;
$this->_buildTree();
$cnt = $this->_buildTree();
$this->out->elementStart('div', array('id' =>'notices_primary'));
$this->out->element('h2', null, _('Notices'));
@ -181,6 +179,8 @@ class ConversationTree extends NoticeList
$this->tree[$notice->reply_to] = array($notice->id);
}
}
return $cnt;
}
/**