X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouprss.php;h=490f6f945cac57b509f968b3f771aea5b3f3c5c5;hb=2f2fa100715f9c09b2b91a2d1afddacf7b7f16db;hp=70c1ded488e89c46ff9397b5a3da65f27b30e923;hpb=bbb830e14c718c687f0636710a1827c90b11f4cc;p=quix0rs-gnu-social.git diff --git a/actions/grouprss.php b/actions/grouprss.php index 70c1ded488..490f6f945c 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -76,11 +76,6 @@ class groupRssAction extends Rss10Action { parent::prepare($args); - if (!common_config('inboxes','enabled')) { - $this->serverError(_('Inboxes must be enabled for groups to work')); - return false; - } - $nickname_arg = $this->arg('nickname'); $nickname = common_canonical_nickname($nickname_arg); @@ -93,17 +88,25 @@ class groupRssAction extends Rss10Action } if (!$nickname) { - $this->clientError(_('No nickname'), 404); + $this->clientError(_('No nickname.'), 404); + return false; + } + + $local = Local_group::staticGet('nickname', $nickname); + + if (!$local) { + $this->clientError(_('No such group.'), 404); return false; } - $this->group = User_group::staticGet('nickname', $nickname); + $this->group = User_group::staticGet('id', $local->group_id); if (!$this->group) { - $this->clientError(_('No such group'), 404); + $this->clientError(_('No such group.'), 404); return false; } + $this->notices = $this->getNotices($this->limit); return true; }