jenkins-bot has submitted this change and it was merged.
Change subject: flow-hide role should not be considered for locked topics
......................................................................
flow-hide role should not be considered for locked topics
The flow-hide role is given to everyone and isn't really relevnt
to lock/unlock which is only available to users. Remove flow-hide
roles from the list of roles that enable actions against locked topics.
Change-Id: I48502ad97c672909793bf7e0f927ac66dc517ac5
---
M FlowActions.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index 8b7a45a..0d7496c 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -81,7 +81,7 @@
'rc_insert' => true,
'permissions' => array(
PostSummary::MODERATED_NONE => '',
- PostSummary::MODERATED_LOCKED => array( 'flow-hide',
'flow-lock', 'flow-delete', 'flow-suppress' ),
+ PostSummary::MODERATED_LOCKED => array( 'flow-lock',
'flow-delete', 'flow-suppress' ),
PostSummary::MODERATED_HIDDEN => array( 'flow-hide',
'flow-delete', 'flow-suppress' ),
PostSummary::MODERATED_DELETED => array( 'flow-delete',
'flow-suppress' ),
PostSummary::MODERATED_SUPPRESSED => array(
'flow-suppress' ),
@@ -105,7 +105,7 @@
'rc_insert' => true,
'permissions' => array(
PostSummary::MODERATED_NONE => '',
- PostSummary::MODERATED_LOCKED => array( 'flow-hide',
'flow-lock', 'flow-delete', 'flow-suppress' ),
+ PostSummary::MODERATED_LOCKED => array( 'flow-lock',
'flow-delete', 'flow-suppress' ),
PostSummary::MODERATED_HIDDEN => array( 'flow-hide',
'flow-delete', 'flow-suppress' ),
PostSummary::MODERATED_DELETED => array( 'flow-delete',
'flow-suppress' ),
PostSummary::MODERATED_SUPPRESSED => array(
'flow-suppress' ),
@@ -470,7 +470,7 @@
return true;
},
'permissions' => array(
- PostRevision::MODERATED_LOCKED => array( 'flow-hide',
'flow-lock', 'flow-delete', 'flow-suppress' ),
+ PostRevision::MODERATED_LOCKED => array( 'flow-lock',
'flow-delete', 'flow-suppress' ),
PostRevision::MODERATED_HIDDEN => array( 'flow-hide',
'flow-delete', 'flow-suppress' ),
PostRevision::MODERATED_DELETED => array(
'flow-delete', 'flow-suppress' ),
PostRevision::MODERATED_SUPPRESSED => 'flow-suppress',
--
To view, visit https://gerrit.wikimedia.org/r/164475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48502ad97c672909793bf7e0f927ac66dc517ac5
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org>
Gerrit-Reviewer: SG <shah...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
