diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-04 15:12:40 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-04 15:12:40 -0800 |
| commit | ba26ffeef19576fe2587007de43b5077b0cd6aa5 (patch) | |
| tree | e487e4d86fc8c5b1101cf143d0b7d757d4da4df1 /classes/User.php | |
| parent | 2eadeca74515802dccc63d7ec84af1bc7d1338d9 (diff) | |
| parent | 9554b4ccbf0783516ea1735a7c999919be33c280 (diff) | |
Merge branch 'inbox-del' into testing
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/classes/User.php b/classes/User.php index 0ab816b57..72c3f39e9 100644 --- a/classes/User.php +++ b/classes/User.php @@ -502,28 +502,22 @@ class User extends Memcached_DataObject function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, false); - return Notice::getStreamByIds($ids); + return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, false); } function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, true); - return Notice::getStreamByIds($ids); + return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, true); } function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, false); - - return Notice::getStreamByIds($ids); + return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, false); } function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) { - $ids = Inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since, true); - - return Notice::getStreamByIds($ids); + return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, $since, true); } function blowFavesCache() |