use inboxnoticestream in RSS 1.0

diff --git a/actions/allrss.php b/actions/allrss.php
index 573bb4eb2fac27c83a200df9d8b40bfa6347ed2a..6d82e551e7cd6fa73395dce2281d3933168ad260 100644 (file)
--- 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()) {