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

darcs-hash:20081005181350-7b5ce-1e722af0bd3677b27dd6d100456131a42072dd91.gz
This commit is contained in:
Zach Copley 2008-10-05 14:13:50 -04:00
parent fd90290d93
commit e115322473

View File

@ -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