summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-07 17:14:55 -0800
committerEvan Prodromou <evan@controlyourself.ca>2009-03-07 17:14:55 -0800
commitd014d43c6860e3aaf46a5afba0ea3dffd54f630d (patch)
tree562d0d402255dff7daadefd4bdbc4fb2b1564be4 /lib
parentc21d61840dcacb8dac3f511decef61f2fb3a80d9 (diff)
parentf9a7ae27b8879569a3f0eff478cbd3b650bdca28 (diff)
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib')
-rw-r--r--lib/grouplist.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 1b8547499..8e2637fec 100644
--- 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();