forked from GNUsocial/gnu-social
no limit on conversation stream
This commit is contained in:
parent
04c713e671
commit
e2f8b8d65d
@ -34,8 +34,6 @@ if (!defined('LACONICA')) {
|
||||
// XXX: not sure how to do paging yet,
|
||||
// so set a 60-notice limit
|
||||
|
||||
define('CONVERSATION_LIMIT', 60);
|
||||
|
||||
require_once INSTALLDIR.'/lib/noticelist.php';
|
||||
|
||||
/**
|
||||
@ -112,7 +110,7 @@ class ConversationAction extends Action
|
||||
|
||||
function showContent()
|
||||
{
|
||||
$notices = Notice::conversationStream($this->id, null, CONVERSATION_LIMIT);
|
||||
$notices = Notice::conversationStream($this->id, 0, null);
|
||||
|
||||
$ct = new ConversationTree($notices, $this);
|
||||
|
||||
|
@ -1187,6 +1187,7 @@ class Notice extends Memcached_DataObject
|
||||
|
||||
if (empty($cache) ||
|
||||
$since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
|
||||
is_null($limit) ||
|
||||
($offset + $limit) > NOTICE_CACHE_WINDOW) {
|
||||
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
|
||||
$max_id, $since)));
|
||||
|
Loading…
Reference in New Issue
Block a user