Merge "mediawiki.mixins.rotation: Remove unnecessary @-o-keyframes"

[lhc/web/wiklou.git] / includes / user / User.php

diff --git a/includes/user/User.php b/includes/user/User.php
index 5ea6d0d..6ec0ff0 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -151,7 +151,6 @@ class User implements IDBAccessObject {
                'patrol',
                'patrolmarks',
                'protect',
-               'proxyunbannable',
                'purge',
                'read',
                'reupload',
@@ -1521,9 +1520,7 @@ class User implements IDBAccessObject {
                $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;
@@ -1542,7 +1539,6 @@ class User implements IDBAccessObject {
                if ( !$block instanceof Block
                        && $wgApplyIpBlocksToXff
                        && $ip !== null
-                       && !$this->isAllowed( 'proxyunbannable' )
                        && !in_array( $ip, $wgProxyWhitelist )
                ) {
                        $xff = $this->getRequest()->getHeader( 'X-Forwarded-For' );
@@ -3251,13 +3247,6 @@ class User implements IDBAccessObject {
                if ( $action === '' ) {
                        return true; // In the spirit of DWIM
                }
-               // Patrolling may not be enabled
-               if ( $action === 'patrol' || $action === 'autopatrol' ) {
-                       global $wgUseRCPatrol, $wgUseNPPatrol;
-                       if ( !$wgUseRCPatrol && !$wgUseNPPatrol ) {
-                               return false;
-                       }
-               }
                // Use strict parameter to avoid matching numeric 0 accidentally inserted
                // by misconfiguration: 0 == 'foo'
                return in_array( $action, $this->getRights(), true );