X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fgrouplist.php;h=b41c5b5f8488c0898fe10f83ff1c726939d31d94;hb=acaf07f6e8c873e0069e84dac74bac3c7da98a97;hp=8e2637fec9626de9615f6243b2e3cba5dd19acee;hpb=61940e37ff89710628eff1a4ad6db8df16142cec;p=quix0rs-gnu-social.git

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 8e2637fec9..b41c5b5f84 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Widget to show a list of groups
  *
@@ -21,14 +21,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Public
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@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://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,10 +40,10 @@ define('GROUPS_PER_PAGE', 20);
  * Widget to show a list of groups
  *
  * @category Public
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @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://laconi.ca/
+ * @link     http://status.net/
  */
 
 class GroupList extends Widget
@@ -164,11 +164,9 @@ class GroupList extends Widget
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
-                if (!$user->isAdmin($this->group)) {
-                    $lf = new LeaveForm($this->out, $this->group);
-                    $lf->show();
-                }
-            } else {
+                $lf = new LeaveForm($this->out, $this->group);
+                $lf->show();
+            } else if (!Group_block::isBlocked($this->group, $user->getProfile())) {
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }