diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-07-03 15:42:55 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-07-03 15:42:55 -0700 |
| commit | 2881b553fec5167c8252f7c55247345e1af11be5 (patch) | |
| tree | 60e215fb1e5eaa4e566f7b197f6ae10ffc3e4345 /classes/Notice.php | |
| parent | c02acd7341cc3104b75a56e0b8dfd4811e77e278 (diff) | |
| parent | 088fa6befcf93607020fa2c77fcfdc952239efb8 (diff) | |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev:
null for both args in conversation
no limit on conversation stream
fixed limit for conversations
only show subscribe button in profile list for local users
move peoplesearchresults class to action/peoplesearch
only show subscription controls to owner
Diffstat (limited to 'classes/Notice.php')
| -rw-r--r-- | classes/Notice.php | 1 |
1 files changed, 1 insertions, 0 deletions
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))); |