X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouprss.php;h=87e34d73f80eccb6eb9020bd5ac005a606dea475;hb=d1b10ee92bec69e8401bca743b8145f98437074f;hp=39dcff83d9f34af62341e2649464cf55c6fc5b46;hpb=9573f725c12e291e4bd3e3156557e41a10753d76;p=quix0rs-gnu-social.git diff --git a/actions/grouprss.php b/actions/grouprss.php index 39dcff83d9..87e34d73f8 100644 --- a/actions/grouprss.php +++ b/actions/grouprss.php @@ -81,29 +81,25 @@ class groupRssAction extends Rss10Action if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); common_redirect(common_local_url('showgroup', $args), 301); - return false; } if (!$nickname) { // TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname. $this->clientError(_('No nickname.'), 404); - return false; } - $local = Local_group::staticGet('nickname', $nickname); + $local = Local_group::getKV('nickname', $nickname); if (!$local) { // TRANS: Client error displayed when requesting a group RSS feed for group that does not exist. $this->clientError(_('No such group.'), 404); - return false; } - $this->group = User_group::staticGet('id', $local->group_id); + $this->group = User_group::getKV('id', $local->group_id); if (!$this->group) { // TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group. $this->clientError(_('No such group.'), 404); - return false; } $this->notices = $this->getNotices($this->limit); @@ -137,7 +133,7 @@ class groupRssAction extends Rss10Action // TRANS: Message is used as link title. %s is a user nickname. 'title' => sprintf(_('%s timeline'), $group->nickname), 'link' => common_local_url('showgroup', array('nickname' => $group->nickname)), - // TRANS: Message is used as link description. %1$s is a username, %2$s is a site name. + // TRANS: Message is used as link description. %1$s is a group name, %2$s is a site name. 'description' => sprintf(_('Updates from members of %1$s on %2$s!'), $group->nickname, common_config('site', 'name'))); return $c;