diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2008-10-22 17:04:45 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2008-10-22 17:04:45 -0400 |
commit | 561140fbedf7bbf6898bd228d4d9f202ca256cc0 (patch) | |
tree | 45935fe80a59269bd598e52a09db3f750aade4ae /classes/User.php | |
parent | 0b0d58b43336f3fe646a309e789c075a6e169d44 (diff) |
change User to use notice inboxes rather than subscription
darcs-hash:20081022210445-5ed1f-94a7b172f33411dfa8d1faaf7dc72169f57d6b39.gz
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/User.php b/classes/User.php index 25caf0358..831b18f6f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -349,8 +349,8 @@ class User extends Memcached_DataObject function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) { $qry = 'SELECT notice.* ' . - 'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' . - 'WHERE subscription.subscriber = %d '; + 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . + 'WHERE notice_inbox.user_id = %d '; if ($since_id > 0) { $qry .= ' AND notice.id > ' . $since_id . ' '; |