diff options
| -rw-r--r-- | actions/conversation.php | 4 | ||||
| -rw-r--r-- | classes/Notice.php | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/actions/conversation.php b/actions/conversation.php index 5049a2232..4c4471f83 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -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); diff --git a/classes/Notice.php b/classes/Notice.php index 2ba2f31b1..8a018068a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -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))); |