GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Issue #121 - use correct Group ID and strict User_group typing

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-01-09 14:06:31 +01:00
parent d1e609a886
commit fbec7c4e75
4 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Directory/lib/sortablegrouplist.php
View File

@@ -196,7 +196,7 @@ class SortableGroupListItem extends SortableSubscriptionListItem
$r2args['action'] = $action;
if ($cur instanceof User && $cur->hasRight(Right::DELETEGROUP)) {
$this->out->elementStart('li', 'entity_delete');
$df = new DeleteGroupForm($this->out, $this->profile, $r2args);
$df = new DeleteGroupForm($this->out, $this->profile->getGroup(), $r2args);
$df->show();
$this->out->elementEnd('li');
}
@@ -224,10 +224,10 @@ class SortableGroupListItem extends SortableSubscriptionListItem
// XXX: special-case for user looking at own
// subscriptions page
if ($user->isMember($this->profile->getGroup())) {
$lf = new LeaveForm($this->out, $this->profile);
$lf = new LeaveForm($this->out, $this->profile->getGroup());
$lf->show();
} else if (!Group_block::isBlocked($this->profile, $user->getProfile())) {
$jf = new JoinForm($this->out, $this->profile);
} else if (!Group_block::isBlocked($this->profile->getGroup(), $user->getProfile())) {
$jf = new JoinForm($this->out, $this->profile->getGroup());
$jf->show();
}