From fd48af20320fac39b834bc42baf9f089a7b956b6 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Tue, 11 May 2021 22:16:55 -0400 Subject: [PATCH] Massively simplify TagPolicy --- extensions/approval/src/Access/TagPolicy.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/extensions/approval/src/Access/TagPolicy.php b/extensions/approval/src/Access/TagPolicy.php index 954bbcfa0..0e9de76a8 100755 --- a/extensions/approval/src/Access/TagPolicy.php +++ b/extensions/approval/src/Access/TagPolicy.php @@ -16,20 +16,10 @@ use Flarum\User\User; class TagPolicy extends AbstractPolicy { /** - * @param User $actor - * @param Tag $tag * @return bool|null */ public function addToDiscussion(User $actor, Tag $tag) { - static $disallowedTags; - - if (! isset($disallowedTags[$actor->id])) { - $disallowedTags[$actor->id] = Tag::getIdsWhereCannot($actor, 'discussion.startWithoutApproval'); - } - - if (in_array($tag->id, $disallowedTags)) { - return $this->deny(); - } + return $actor->can('discussion.startWithoutApproval', $tag); } }