X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fgrouprss.php;h=0f54fc435b8584c70d2a6285b42a66558b64896f;hb=53af608ef882eb03cd924ed630f98d856c11370a;hp=50e48a67e9ea7121e462fdbcc5b2ef0a2063f9fe;hpb=39598582d90eab2a8abaf2ca01bcad6cb09d2c73;p=quix0rs-gnu-social.git

diff --git a/actions/grouprss.php b/actions/grouprss.php
index 50e48a67e9..0f54fc435b 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,7 +69,6 @@ class groupRssAction extends Rss10Action
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -88,14 +85,24 @@ class groupRssAction extends Rss10Action
         }
 
         if (!$nickname) {
-            $this->clientError(_('No nickname'), 404);
+            // 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);
+
+        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('nickname', $nickname);
+        $this->group = User_group::staticGet('id', $local->group_id);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            // 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;
         }
 
@@ -105,7 +112,6 @@ class groupRssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $group = $this->group;
 
         if (is_null($group)) {
@@ -128,8 +134,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;