X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouprss.php;h=87e34d73f80eccb6eb9020bd5ac005a606dea475;hb=bf94154c96961a2634881799fb9d2dd0039d2d82;hp=6a6b55e78f73a98096a5f289ae5625e4ebde9583;hpb=7bd65a7b86d7d694d28e81f7d6897cbefd9d9e1d;p=quix0rs-gnu-social.git

diff --git a/actions/grouprss.php b/actions/grouprss.php
index 6a6b55e78f..87e34d73f8 100644
--- a/actions/grouprss.php
+++ b/actions/grouprss.php
@@ -45,7 +45,6 @@ define('MEMBERS_PER_SECTION', 27);
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class groupRssAction extends Rss10Action
 {
     /** group we're viewing. */
@@ -56,7 +55,6 @@ class groupRssAction extends Rss10Action
      *
      * @return boolean true
      */
-
     function isReadOnly($args)
     {
         return true;
@@ -71,16 +69,10 @@ class groupRssAction extends Rss10Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         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);
 
@@ -89,19 +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) {
-            $this->clientError(_('No nickname'), 404);
-            return false;
+            // TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
+            $this->clientError(_('No nickname.'), 404);
         }
 
-        $this->group = User_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);
+        }
+
+        $this->group = User_group::getKV('id', $local->group_id);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
-            return false;
+            // TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+            $this->clientError(_('No such group.'), 404);
         }
 
         $this->notices = $this->getNotices($this->limit);
@@ -110,7 +108,6 @@ class groupRssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $group = $this->group;
 
         if (is_null($group)) {
@@ -133,8 +130,10 @@ class groupRssAction extends Rss10Action
         $c = array('url' => common_local_url('grouprss',
                                              array('nickname' =>
                                                    $group->nickname)),
+                   // 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 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;