diff options
Diffstat (limited to 'actions/twitapistatuses.php')
| -rw-r--r-- | actions/twitapistatuses.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 47e3ffcd9..749f2f084 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -223,18 +223,8 @@ class TwitapistatusesAction extends TwitterapiAction { $link = common_local_url('all', array('nickname' => $user->nickname)); $subtitle = sprintf(_("Updates from %s and friends on %s!"), $user->nickname, $sitename); - $notice = new Notice(); - - # XXX: chokety and bad - - $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR'); - $notice->whereAdd('profile_id = ' . $profile->id, 'OR'); - - # XXX: since - # XXX: since_id + $notice->$user->noticesWithFriends(); - $notice->orderBy('created DESC, notice.id DESC'); - $notice->limit((($page-1)*20), $count); $cnt = $notice->find(); |