From 831eaa039bc5b70532bc556ee47a45ebd03ac5de Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 7 Apr 2011 15:28:25 -0400 Subject: [PATCH] use inboxnoticestream in RSS 1.0 --- actions/allrss.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/actions/allrss.php b/actions/allrss.php index 573bb4eb2f..6d82e551e7 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -83,16 +83,9 @@ class AllrssAction extends Rss10Action */ function getNotices($limit=0) { - $cur = common_current_user(); - $user = $this->user; - - if (!empty($cur) && $cur->id == $user->id) { - $notice = $this->user->noticeInbox(0, $limit); - } else { - $notice = $this->user->noticesWithFriends(0, $limit); - } + $stream = new InboxNoticeStream($this->user); + $notice = $stream->getNotices(0, $limit, null, null); - $notice = $user->noticesWithFriends(0, $limit); $notices = array(); while ($notice->fetch()) { -- 2.39.5