Another patch to fix up whitespace conflicts in User.php

darcs-hash:20081005181614-7b5ce-4ab236108fe2570a199120317120d921715fbd19.gz
This commit is contained in:
Zach Copley 2008-10-05 14:16:14 -04:00
parent e115322473
commit 06a80c829b

View File

@ -143,9 +143,8 @@ class User extends Memcached_DataObject
function noticesWithFriendsWindow() { function noticesWithFriendsWindow() {
$notice = new Notice(); $notice = new Notice();
$notice->query('SELECT notice.* ' . $notice->query('SELECT notice.* ' .
'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' . 'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
'WHERE subscription.subscriber = ' . $this->id . ' ' . 'WHERE subscription.subscriber = ' . $this->id . ' ' .