Commit b8d32a51 authored by Sarven Capadisli's avatar Sarven Capadisli

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

parents c8328882 90557e91
......@@ -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;
}
/**
......
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