Merge branch '0.7.x' into 0.8.x

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

diff --git a/actions/groups.php b/actions/groups.php
index 206065d2636a8b29d9372e29ecf3f37bf3c5fbe4..3d62843ed678d54d08c9fd3ccb5ca897568a5c75 100644 (file)
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -51,6 +51,11 @@ class GroupsAction extends Action
     var $page = null;
     var $profile = null;
 
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
     function title()
     {
         if ($this->page == 1) {
@@ -95,9 +100,13 @@ class GroupsAction extends Action
 
     function showContent()
     {
-        $this->element('a', array('href' => common_local_url('newgroup'),
-                                  'id' => 'new_group'),
-                       _('Create a new group'));
+        if (common_logged_in()) {
+            $this->elementStart('p', array('id' => 'new_group'));
+            $this->element('a', array('href' => common_local_url('newgroup'),
+                                      'class' => 'more'),
+                           _('Create a new group'));
+            $this->elementEnd('p');
+        }
 
         $offset = ($this->page-1) * GROUPS_PER_PAGE;
         $limit =  GROUPS_PER_PAGE + 1;
@@ -106,6 +115,7 @@ class GroupsAction extends Action
         $groups->orderBy('created DESC');
         $groups->limit($offset, $limit);
 
+        $cnt = 0;
         if ($groups->find()) {
             $gl = new GroupList($groups, null, $this);
             $cnt = $gl->show();
@@ -119,5 +129,7 @@ class GroupsAction extends Action
     {
         $gbp = new GroupsByPostsSection($this);
         $gbp->show();
+        $gbm = new GroupsByMembersSection($this);
+        $gbm->show();
     }
 }