Skip to content

Commit 7814117

Browse files
committed
Issues-490: Fixed Discussion Dismiss option
1 parent 8804834 commit 7814117

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

models/class.groupmodel.php

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,21 +1549,10 @@ public function canEditDiscussion($discussion) {
15491549
*
15501550
*/
15511551
public function canDismissDiscussion($discussion) {
1552-
$canDismissDiscussion = CategoryModel::checkPermission($discussion->CategoryID, 'Vanilla.Discussions.Dismiss', true)
1552+
$canDismissDiscussion = c('Vanilla.Discussions.Dismiss', 1)
15531553
&& $discussion->Announce
15541554
&& !$discussion->Dismissed
15551555
&& Gdn::session()->isValid();
1556-
1557-
/*
1558-
$groupID = $this->findGroupIDFromDiscussion($discussion);
1559-
if($groupID) {
1560-
$group = $this->getByGroupID($groupID);
1561-
$groupRole = self::getGroupRoleFor(Gdn::session()->UserID, $groupID);
1562-
if ($groupRole === GroupModel::ROLE_LEADER || Gdn::session()->UserID === $group->OwnerID ||
1563-
Gdn::session()->checkPermission(GroupsPlugin::GROUPS_MODERATION_MANAGE_PERMISSION)) {
1564-
return true;
1565-
}
1566-
} */
15671556
return $canDismissDiscussion;
15681557

15691558
}

0 commit comments

Comments
 (0)