X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=6d82e551e7cd6fa73395dce2281d3933168ad260;hb=c97048d01bea468e0cf8865b60c3c250b4515c39;hp=d398c8a6ad126fbdfbe64560779943a054023fbe;hpb=a12474a99d0322123b1c8318dfa609d5d5392c7f;p=quix0rs-gnu-social.git diff --git a/actions/allrss.php b/actions/allrss.php index d398c8a6ad..6d82e551e7 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -56,6 +56,8 @@ class AllrssAction extends Rss10Action * @param array $args Web and URL arguments * * @return boolean false if user doesn't exist + * + */ function prepare($args) { parent::prepare($args); @@ -81,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()) {