diff options
author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-18 23:28:48 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-18 23:28:48 +0000 |
commit | 8d68c5238dfed8872e8ef3bf128d018cc974cdab (patch) | |
tree | 60434542677d1769ecb0cc657a3ea1a2d9be3e46 /classes/Notice.php | |
parent | 8b5bcae58fba59734a566315f04499fcc1433c75 (diff) | |
parent | 9261e48ef039869fb3709d374b7e4346d8773a49 (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index f6ac4f780..1b5c0ab0a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1024,7 +1024,7 @@ class Notice extends Memcached_DataObject } } - function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null) + function stream($fn, $args, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $since=null, $tag=null) { $cache = common_memcache(); @@ -1032,7 +1032,7 @@ class Notice extends Memcached_DataObject $since_id != 0 || $before_id != 0 || !is_null($since) || ($offset + $limit) > NOTICE_CACHE_WINDOW) { return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id, - $before_id, $since))); + $before_id, $since, $tag))); } $idkey = common_cache_key($cachekey); @@ -1052,7 +1052,7 @@ class Notice extends Memcached_DataObject $window = explode(',', $laststr); $last_id = $window[0]; $new_ids = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW, - $last_id, 0, null))); + $last_id, 0, null, $tag))); $new_window = array_merge($new_ids, $window); @@ -1067,7 +1067,7 @@ class Notice extends Memcached_DataObject } $window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW, - 0, 0, null))); + 0, 0, null, $tag))); $windowstr = implode(',', $window); |