X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=885a67f6188af13b07a0ea7e6bf9a8302078e476;hb=684fc5d002998abd352f4e1c00c1a9a77cd91e53;hp=0114c43962ad312075337ef347010fada0c25a1b;hpb=bab3e1b8586f42bc1f0a5f96b6990d67c6b74446;p=quix0rs-gnu-social.git diff --git a/actions/allrss.php b/actions/allrss.php index 0114c43962..885a67f618 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -13,7 +13,7 @@ * @link http://laconi.ca/ * * Laconica - a distributed open-source microblogging tool - * Copyright (C) 2008, Controlez-Vous, Inc. + * Copyright (C) 2008, 2009, Control Yourself, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -81,8 +81,17 @@ class AllrssAction extends Rss10Action */ function getNotices($limit=0) { - $user = $this->user; - $notice = $user->noticesWithFriends(0, $limit); + $cur = common_current_user(); + + if (!empty($cur) && $cur->id == $user->id) { + $notice = $this->user->noticeInbox(0, $limit); + } else { + $notice = $this->user->noticesWithFriends(0, $limit); + } + + $user = $this->user; + $notice = $user->noticesWithFriends(0, $limit); + $notices = array(); while ($notice->fetch()) { $notices[] = clone($notice);