summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-10-05 14:13:50 -0400
committerZach Copley <zach@controlyourself.ca>2008-10-05 14:13:50 -0400
commite115322473a0b9239e3ce3502fcdbe85fdf388d7 (patch)
tree43083ab268f9b719b63038822cbd77639a278d00 /classes
parentfd90290d935b0ea032940f89236df86694bfb44e (diff)
Fixed up conflict (over white space) in User.php
darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz
Diffstat (limited to 'classes')
-rw-r--r--classes/User.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/classes/User.php b/classes/User.php
index 25caf0358..ce7632ec5 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -141,6 +141,19 @@ class User extends Memcached_DataObject
return true;
}
+ function noticesWithFriendsWindow() {
+
+
+ $notice = new Notice();
+
+ $notice->query('SELECT notice.* ' .
+ 'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
+ 'WHERE subscription.subscriber = ' . $this->id . ' ' .
+ 'ORDER BY created DESC, notice.id DESC ' .
+ 'LIMIT 0, ' . WITHFRIENDS_CACHE_WINDOW);
+
+ }
+
static function register($fields) {
# MAGICALLY put fields into current scope