Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

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

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 1b854749982198e68f89de742d2c1fd306e3ce1c..8e2637fec9626de9615f6243b2e3cba5dd19acee 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -164,8 +164,10 @@ class GroupList extends Widget
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
-                $lf = new LeaveForm($this->out, $this->group);
-                $lf->show();
+                if (!$user->isAdmin($this->group)) {
+                    $lf = new LeaveForm($this->out, $this->group);
+                    $lf->show();
+                }
             } else {
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();