diff options
| author | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
|---|---|---|
| committer | Craig Andrews <candrews@integralblue.com> | 2010-02-16 10:25:57 -0500 |
| commit | 32084e33a266797b306158df29e48f057651b410 (patch) | |
| tree | 2a46e529783c8547aaae8ac00c8cac9bdfa61490 /classes/User.php | |
| parent | 057ec1fceacbfec1f755a5bc6700a188aa70e33f (diff) | |
| parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) | |
Merge branch '0.9.x' into 1.0.x
Conflicts:
lib/queuemanager.php
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 e7cecf975..1c967b527 100644 --- a/classes/User.php +++ b/classes/User.php @@ -497,28 +497,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() |