Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71537
Change subject: Update protection handling for core change I6bf650a3
......................................................................
Update protection handling for core change I6bf650a3
Gerrit change I6bf650a3 to mediawiki/core changed the rights used for
the default page protection levels, and changed the behavior of the
'editprotected' right. This changes FlaggedRevs to match.
Change-Id: Iac866bc19fdd47476559b940ea27b73ad4248616
---
M backend/FlaggedRevs.class.php
M backend/FlaggedRevs.hooks.php
2 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs
refs/changes/37/71537/1
diff --git a/backend/FlaggedRevs.class.php b/backend/FlaggedRevs.class.php
index 42eeca4..910bb43 100644
--- a/backend/FlaggedRevs.class.php
+++ b/backend/FlaggedRevs.class.php
@@ -502,8 +502,13 @@
}
# Don't let them choose levels above their own rights
if ( $right == 'sysop' ) {
- // special case, rewrite sysop to protect and
editprotected
- if ( !$user->isAllowed( 'protect' ) &&
!$user->isAllowed( 'editprotected' ) ) {
+ // special case, rewrite sysop to editprotected
+ if ( !$user->isAllowed( 'editprotected' ) ) {
+ return false;
+ }
+ } elseif ( $right == 'autoconfirmed' ) {
+ // special case, rewrite autoconfirmed to
editsemiprotected
+ if ( !$user->isAllowed( 'editsemiprotected' ) ) {
return false;
}
} elseif ( !$user->isAllowed( $right ) ) {
diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index b22e50c..9a16917 100644
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -340,11 +340,8 @@
// Backwards compatibility, rewrite sysop ->
protect
$right = ( $right === 'sysop' ) ? 'protect' :
$right;
if ( $right != '' && !$user->isAllowed( $right
) ) {
- // 'editprotected' bypasses this
restriction
- if ( !$user->isAllowed( 'editprotected'
) ) {
- $result = false;
- return false;
- }
+ $result = false;
+ return false;
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71537
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac866bc19fdd47476559b940ea27b73ad4248616
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
