Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / groupaction.php

diff --git a/lib/groupaction.php b/lib/groupaction.php
index a5e62a2a5a523f3e3ea456bd4a833a4fcc0931ef..b1a5d771979caf5c432882ada033e0eddedd3d8c 100644 (file)
--- a/lib/groupaction.php
+++ b/lib/groupaction.php
@@ -46,7 +46,7 @@ class GroupAction extends Action
 {
     protected $group;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -61,40 +61,35 @@ class GroupAction extends Action
                 $args['page'] = $this->page;
             }
             common_redirect(common_local_url('showgroup', $args), 301);
-            return false;
         }
 
         if (!$nickname) {
             // TRANS: Client error displayed if no nickname argument was given requesting a group page.
             $this->clientError(_('No nickname.'), 404);
-            return false;
         }
 
-        $local = Local_group::staticGet('nickname', $nickname);
+        $local = Local_group::getKV('nickname', $nickname);
 
         if (!$local) {
-            $alias = Group_alias::staticGet('alias', $nickname);
+            $alias = Group_alias::getKV('alias', $nickname);
             if ($alias) {
                 $args = array('id' => $alias->group_id);
                 if ($this->page != 1) {
                     $args['page'] = $this->page;
                 }
                 common_redirect(common_local_url('groupbyid', $args), 301);
-                return false;
             } else {
                 common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
                 // TRANS: Client error displayed if no remote group with a given name was found requesting group page.
                 $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 if no local group with a given name was found requesting group page.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
     }
 
@@ -227,10 +222,6 @@ class GroupAction extends Action
     {
         $blocked = $this->group->getBlocked(0, MEMBERS_PER_SECTION);
 
-        if (!$blocked) {
-            return;
-        }
-
         $this->elementStart('div', array('id' => 'entity_blocked',
                                          'class' => 'section'));
 
@@ -293,6 +284,11 @@ class GroupAction extends Action
 
         return $options;
     }
+
+    function getGroup()
+    {
+        return $this->group;
+    }
 }
 
 class GroupAdminSection extends ProfileSection
@@ -329,7 +325,7 @@ class GroupAdminSection extends ProfileSection
 
 class GroupMembersMiniList extends ProfileMiniList
 {
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new GroupMembersMiniListItem($profile, $this->action);
     }
@@ -351,7 +347,7 @@ class GroupMembersMiniListItem extends ProfileMiniListItem
 
 class GroupBlockedMiniList extends ProfileMiniList
 {
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new GroupBlockedMiniListItem($profile, $this->action);
     }