summaryrefslogtreecommitdiff
path: root/lib/grouplist.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-15 11:50:08 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-15 11:50:08 -0700
commit92f095f589b3fc4ab40f72f873d6a7a189b63a96 (patch)
treeddb98469e596b276219becca33a93b0a454961dd /lib/grouplist.php
parent946d016df2a5e0af5e1b4b983b30c113dd02b4ea (diff)
parenteb6a60ef8833d0a34768f2717f2a34fdcd52e5ce (diff)
Merge branch '0.8.x' into userdesign
* 0.8.x: (32 commits) updates to Status_network makeadmin action make admins of groups show aliases when showing a group Link and distribute notices tagged for a group alias Code for adding and saving group aliases Styles for group block add correct li for css magic for block stuff typo in profileminilist class return count from show try to get the right class for profileminilist fix perms for classes/statusnet.ini fixup perms for classes Added Group_alias class add a table for group aliases Cross-browser notice_attach Allow users to be unblocked from a group Some UI improvements for blocking and unblocking The rest of the things necessary to make group block work Make group block work ... Conflicts: db/laconica.sql lib/common.php
Diffstat (limited to 'lib/grouplist.php')
-rw-r--r--lib/grouplist.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 1b8547499..1ded5160b 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -166,7 +166,7 @@ class GroupList extends Widget
if ($user->isMember($this->group)) {
$lf = new LeaveForm($this->out, $this->group);
$lf->show();
- } else {
+ } else if (!Group_block::isBlocked($this->group, $user->getProfile())) {
$jf = new JoinForm($this->out, $this->group);
$jf->show();
}