Fixed up conflict (over white space) in User.php

darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz

diff --git a/classes/User.php b/classes/User.php
index 25caf03585cd2863781db4eb3d9378259ab049bb..ce7632ec5bfe655c5eaba5032b874af24d45ebd1 100644 (file)
--- 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