diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 08:00:41 -0700 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-01 08:00:41 -0700 |
commit | 1a61a171cdb39444e2c0fbed7cf3a92e0ec271df (patch) | |
tree | edf2eb852163f3806d813ac6292ab67be1aed40f /classes/User.php | |
parent | a86a0e91a5acb5ea894a3d066f9adf3b1ef305ae (diff) | |
parent | 19a21947046062fc0cc313b23ae7418d317def89 (diff) |
Merge branch '0.7.x' into cometplugin
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/classes/User.php b/classes/User.php index 3b9b5cd83..ce7ea1464 100644 --- a/classes/User.php +++ b/classes/User.php @@ -444,21 +444,17 @@ class User extends Memcached_DataObject 'SELECT notice.* ' . 'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' . 'WHERE subscription.subscriber = %d '; - $order = null; + return Notice::getStream(sprintf($qry, $this->id), + 'user:notices_with_friends:' . $this->id, + $offset, $limit, $since_id, $before_id, + $order, $since); } else if ($enabled === true || ($enabled == 'transitional' && $this->inboxed == 1)) { - $qry = - 'SELECT notice.* ' . - 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . - 'WHERE notice_inbox.user_id = %d '; - // NOTE: we override ORDER - $order = null; + $ids = Notice_inbox::stream($this->id, $offset, $limit, $since_id, $before_id, $since); + + return Notice::getStreamByIds($ids); } - return Notice::getStream(sprintf($qry, $this->id), - 'user:notices_with_friends:' . $this->id, - $offset, $limit, $since_id, $before_id, - $order, $since); } function blowFavesCache() |