summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-10-05 14:16:14 -0400
committerZach Copley <zach@controlyourself.ca>2008-10-05 14:16:14 -0400
commit06a80c829b7e183f42bafd1dfd92b65f11dad42b (patch)
treeb76f1e6270d19bde72604b18658e72fb75da0b03 /classes/User.php
parente115322473a0b9239e3ce3502fcdbe85fdf388d7 (diff)
Another patch to fix up whitespace conflicts in User.php
darcs-hash:20081005181614-7b5ce-4ab236108fe2570a199120317120d921715fbd19.gz
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/classes/User.php b/classes/User.php
index ce7632ec5..036da2b88 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -143,9 +143,8 @@ class User extends Memcached_DataObject
function noticesWithFriendsWindow() {
-
$notice = new Notice();
-
+
$notice->query('SELECT notice.* ' .
'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
'WHERE subscription.subscriber = ' . $this->id . ' ' .