jenkins-bot has submitted this change and it was merged.
Change subject: Fix moderation permissions
......................................................................
Fix moderation permissions
Change-Id: I9cd90d9916f354ae24b3b8cbf92da32e214c4533
---
M includes/View/PostActionMenu.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/View/PostActionMenu.php b/includes/View/PostActionMenu.php
index 43d1ea9..547862d 100644
--- a/includes/View/PostActionMenu.php
+++ b/includes/View/PostActionMenu.php
@@ -36,7 +36,6 @@
'method' => 'POST',
'permissions' => array(
PostRevision::MODERATED_NONE =>
'flow-hide',
- PostRevision::MODERATED_HIDDEN =>
'flow-hide',
),
),
'delete-post' => array(
@@ -51,11 +50,13 @@
'permissions' => array(
PostRevision::MODERATED_NONE =>
'flow-censor',
PostRevision::MODERATED_HIDDEN =>
'flow-censor',
+ PostRevision::MODERATED_DELETED =>
'flow-censor',
),
),
'restore-post' => array(
'method' => 'POST',
'permissions' => array(
+ PostRevision::MODERATED_HIDDEN =>
array( 'flow-hide', 'flow-delete', 'flow-censor' ),
PostRevision::MODERATED_DELETED =>
array( 'flow-delete', 'flow-censor' ),
PostRevision::MODERATED_CENSORED =>
'flow-censor',
),
@@ -120,10 +121,9 @@
* Check if a user is allowed to perform (a) certain action(s).
*
* @param string $action
- * @param string[optional] $action2 Overloadable to check if either of
the provided actions are allowed
* @return bool
*/
- public function isAllowed( $action /* [, $action2 [, ... ]] */ ) {
+ public function isAllowed( $action ) {
$details = $this->getActionDetails( $action );
// check if permission is set for this action
--
To view, visit https://gerrit.wikimedia.org/r/90351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9cd90d9916f354ae24b3b8cbf92da32e214c4533
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
