X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fblock%2FBlockManager.php;h=c82ed1c258a27ab3382f6cf2130ab892886e9c46;hb=f7cddcf7c178cb90e993fe3690f310ab06f6a846;hp=68141a178b581489bc1672563a0dab1220a86de6;hpb=5f3ca358fed2e59ee33f1134dbee247495c0f09a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/block/BlockManager.php b/includes/block/BlockManager.php
index 68141a178b..c82ed1c258 100644
--- a/includes/block/BlockManager.php
+++ b/includes/block/BlockManager.php
@@ -293,32 +293,7 @@ class BlockManager {
 			$proxyList = array_map( 'trim', file( $proxyList ) );
 		}
 
-		$resultProxyList = [];
-		$deprecatedIPEntries = [];
-
-		// backward compatibility: move all ip addresses in keys to values
-		foreach ( $proxyList as $key => $value ) {
-			$keyIsIP = IP::isIPAddress( $key );
-			$valueIsIP = IP::isIPAddress( $value );
-			if ( $keyIsIP && !$valueIsIP ) {
-				$deprecatedIPEntries[] = $key;
-				$resultProxyList[] = $key;
-			} elseif ( $keyIsIP && $valueIsIP ) {
-				$deprecatedIPEntries[] = $key;
-				$resultProxyList[] = $key;
-				$resultProxyList[] = $value;
-			} else {
-				$resultProxyList[] = $value;
-			}
-		}
-
-		if ( $deprecatedIPEntries ) {
-			wfDeprecated(
-				'IP addresses in the keys of $wgProxyList (found the following IP addresses in keys: ' .
-				implode( ', ', $deprecatedIPEntries ) . ', please move them to values)', '1.30' );
-		}
-
-		$proxyListIPSet = new IPSet( $resultProxyList );
+		$proxyListIPSet = new IPSet( $proxyList );
 		return $proxyListIPSet->match( $ip );
 	}