Cenarium has uploaded a new change for review.
https://gerrit.wikimedia.org/r/254829
Change subject: Remove proxyunbannable from core
......................................................................
Remove proxyunbannable from core
This removes the userright 'proxyunbannable' from core, because it has
no uses. It is never checked for users with 'ipblock-exempt', yet all
usergroups with 'proxyunbannable' also have 'ipblock-exempt'.
Bug: T75414
Change-Id: I1e4f6ca439c0274af89f3280fbc519df2b68312c
---
M includes/DefaultSettings.php
M includes/User.php
M languages/i18n/en.json
3 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/254829/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ec600dc..b988a67 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4827,7 +4827,6 @@
$wgGroupPermissions['sysop']['autopatrol'] = true;
$wgGroupPermissions['sysop']['protect'] = true;
$wgGroupPermissions['sysop']['editprotected'] = true;
-$wgGroupPermissions['sysop']['proxyunbannable'] = true;
$wgGroupPermissions['sysop']['rollback'] = true;
$wgGroupPermissions['sysop']['upload'] = true;
$wgGroupPermissions['sysop']['reupload'] = true;
diff --git a/includes/User.php b/includes/User.php
index 3d1aa7e..d409ee3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -148,7 +148,6 @@
'patrol',
'patrolmarks',
'protect',
- 'proxyunbannable',
'purge',
'read',
'reupload',
@@ -1556,9 +1555,7 @@
$block = Block::newFromTarget( $this, $ip, !$bFromSlave );
// Proxy blocking
- if ( !$block instanceof Block && $ip !== null &&
!$this->isAllowed( 'proxyunbannable' )
- && !in_array( $ip, $wgProxyWhitelist )
- ) {
+ if ( !$block instanceof Block && $ip !== null && !in_array(
$ip, $wgProxyWhitelist ) ) {
// Local list
if ( self::isLocallyBlockedProxy( $ip ) ) {
$block = new Block;
@@ -1577,7 +1574,6 @@
if ( !$block instanceof Block
&& $wgApplyIpBlocksToXff
&& $ip !== null
- && !$this->isAllowed( 'proxyunbannable' )
&& !in_array( $ip, $wgProxyWhitelist )
) {
$xff = $this->getRequest()->getHeader(
'X-Forwarded-For' );
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8d85bbd..98734a1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1141,7 +1141,6 @@
"right-blockemail": "Block a user from sending email",
"right-hideuser": "Block a username, hiding it from the public",
"right-ipblock-exempt": "Bypass IP blocks, auto-blocks and range
blocks",
- "right-proxyunbannable": "Bypass automatic blocks of proxies",
"right-unblockself": "Unblock oneself",
"right-protect": "Change protection levels and edit cascade-protected
pages",
"right-editprotected": "Edit pages protected as
\"{{int:protect-level-sysop}}\"",
--
To view, visit https://gerrit.wikimedia.org/r/254829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e4f6ca439c0274af89f3280fbc519df2b68312c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cenarium <cenarium.sy...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
