Updated ShowGroup to Resolve Aliases Again.

[quix0rs-gnu-social.git] / actions / groupbyid.php

diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index 9bbf8d3d2ab320ac8e6d23f3d8de4cd85b1d85d9..5af7109cb4074c3da2670cec4fabb7384a870e4a 100644 (file)
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -21,14 +21,14 @@
  *
  * @category  Group
  * @package   StatusNet
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -43,7 +43,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  *
  * @category Group
  * @package  StatusNet
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -68,15 +68,10 @@ class GroupbyidAction extends Action
     {
         parent::prepare($args);
 
-        if (!common_config('inboxes','enabled')) {
-            $this->serverError(_('Inboxes must be enabled for groups to work'));
-            return false;
-        }
-
         $id = $this->arg('id');
 
         if (!$id) {
-            $this->clientError(_('No ID'));
+            $this->clientError(_('No ID.'));
             return false;
         }
 
@@ -85,7 +80,7 @@ class GroupbyidAction extends Action
         $this->group = User_group::staticGet('id', $id);
 
         if (!$this->group) {
-            $this->clientError(_('No such group'), 404);
+            $this->clientError(_('No such group.'), 404);
             return false;
         }