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

conversation code changes

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-30 11:50:16 -04:00
parent 424dd56b2a
commit 4e6cd42757
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
actions/conversation.php
View File

@ -107,17 +107,11 @@ class ConversationAction extends Action
function showContent()
{
$offset = ($this->page-1) * NOTICES_PER_PAGE;
$limit = NOTICES_PER_PAGE + 1;
$notices = Notice::conversationStream($this->id, $offset, $limit);
$notices = Notice::conversationStream($this->id);
$ct = new ConversationTree($notices, $this);
$cnt = $ct->show();
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'conversation', array('id' => $this->id));
}
}
@ -148,6 +142,25 @@ class ConversationTree extends NoticeList
{
$cnt = 0;
$this->_buildTree();
$this->out->elementStart('div', array('id' =>'notices_primary'));
$this->out->element('h2', null, _('Notices'));
$this->out->elementStart('ol', array('class' => 'notices xoxo'));
if (array_key_exists('root', $this->tree)) {
$rootid = $this->tree['root'][0];
$this->showNoticePlus($rootid);
}
$this->out->elementEnd('ol');
$this->out->elementEnd('div');
return $cnt;
}
function _buildTree()
{
$this->tree = array();
$this->table = array();
@ -168,20 +181,6 @@ class ConversationTree extends NoticeList
$this->tree[$notice->reply_to] = array($notice->id);
}
}
$this->out->elementStart('div', array('id' =>'notices_primary'));
$this->out->element('h2', null, _('Notices'));
$this->out->elementStart('ol', array('class' => 'notices xoxo'));
if (array_key_exists('root', $this->tree)) {
$rootid = $this->tree['root'][0];
$this->showNoticePlus($rootid);
}
$this->out->elementEnd('ol');
$this->out->elementEnd('div');
return $cnt;
}
/**

2
classes/Notice.php
View File

@ -795,7 +795,7 @@ class Notice extends Memcached_DataObject
$notice->selectAdd(); // clears it
$notice->selectAdd('id');
$notice->whereAdd('conversation = '.$id);
$notice->conversation = $id;
$notice->orderBy('id DESC');