X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fallrss.php;h=081360a59725d6b647c928ea2624952080e045e8;hb=22577b17edf1d901ed4f8a3089ed539d89e5f1e4;hp=7aab423b2725d8100c4494e92be62c9edfae5eb3;hpb=735b8ddc676cc7d85ca4256994755e61ea6023a1;p=quix0rs-gnu-social.git diff --git a/actions/allrss.php b/actions/allrss.php index 7aab423b27..081360a597 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -46,7 +46,7 @@ class AllrssAction extends Rss10Action { $notice = DB_DataObject::factory('notice'); - $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR'); + $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR'); $notice->whereAdd('profile_id = ' . $user->id, 'OR'); $notice->orderBy('created DESC'); @@ -71,7 +71,7 @@ class AllrssAction extends Rss10Action { 'link' => common_local_url('all', array('nickname' => $user->nickname)), - 'description' => _t('Microblog feed for ') . $user->nickname); + 'description' => _t('Feed for friends of ') . $user->nickname); return $c; }