wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no limit on conversation stream

Browse Source
This commit is contained in:
Evan Prodromou 2009-07-03 10:40:23 -04:00
parent 04c713e671
commit e2f8b8d65d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/conversation.php
View File

@ -34,8 +34,6 @@ if (!defined('LACONICA')) {
// XXX: not sure how to do paging yet, // XXX: not sure how to do paging yet,
// so set a 60-notice limit // so set a 60-notice limit
define('CONVERSATION_LIMIT', 60);
require_once INSTALLDIR.'/lib/noticelist.php'; require_once INSTALLDIR.'/lib/noticelist.php';
/** /**
@ -112,7 +110,7 @@ class ConversationAction extends Action
function showContent() function showContent()
{ {
$notices = Notice::conversationStream($this->id, null, CONVERSATION_LIMIT); $notices = Notice::conversationStream($this->id, 0, null);
$ct = new ConversationTree($notices, $this); $ct = new ConversationTree($notices, $this);

1
classes/Notice.php
View File

@ -1187,6 +1187,7 @@ class Notice extends Memcached_DataObject
if (empty($cache) || if (empty($cache) ||
$since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) || $since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
is_null($limit) ||
($offset + $limit) > NOTICE_CACHE_WINDOW) { ($offset + $limit) > NOTICE_CACHE_WINDOW) {
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id, return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
$max_id, $since))); $max_id, $since)));