Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/groupbyid.php b/actions/groupbyid.php
index de87ec5c672e20da7632ef8f29e99c9411e4a91a..ed4ec979a9c7cccdfdd0acb63579e6ce38943132 100644 (file)
--- a/actions/groupbyid.php
+++ b/actions/groupbyid.php
@@ -42,7 +42,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class GroupbyidAction extends ManagedAction
+class GroupbyidAction extends ShowgroupAction
 {
     /** group we're viewing. */
     protected $group = null;
@@ -55,10 +55,10 @@ class GroupbyidAction extends ManagedAction
     protected function doPreparation()
     {
         $this->group = User_group::getByID($this->arg('id'));
-    }
+        $this->target = $this->group->getProfile();
 
-    public function showPage()
-    {
-        common_redirect($this->group->homeUrl(), 303);
+        if ($this->target->isLocal()) {
+            common_redirect($this->target->getUrl());
+        }
     }
 }