| Index: branches/REL1_17/phase3/includes/DefaultSettings.php |
| — | — | @@ -3103,10 +3103,16 @@ |
| 3104 | 3104 | * @{ |
| 3105 | 3105 | */ |
| 3106 | 3106 | |
| 3107 | | -/** Allow sysops to ban logged-in users */ |
| | 3107 | +/** |
| | 3108 | + * Allow sysops to ban logged-in users |
| | 3109 | + * @deprecated since 1.17, will be made permanently true in 1.18 |
| | 3110 | + */ |
| 3108 | 3111 | $wgSysopUserBans = true; |
| 3109 | 3112 | |
| 3110 | | -/** Allow sysops to ban IP ranges */ |
| | 3113 | +/** |
| | 3114 | + * Allow sysops to ban IP ranges |
| | 3115 | + * @deprecated since 1.17; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead. |
| | 3116 | + */ |
| 3111 | 3117 | $wgSysopRangeBans = true; |
| 3112 | 3118 | |
| 3113 | 3119 | /** |
| Index: branches/REL1_17/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -433,7 +433,7 @@ |
| 434 | 434 | $matches = array(); |
| 435 | 435 | if( preg_match( "/^($rxIP4)\\/(\\d{1,2})$/", $this->BlockAddress, $matches ) ) { |
| 436 | 436 | # IPv4 |
| 437 | | - if( $wgSysopRangeBans ) { |
| | 437 | + if( $wgSysopRangeBans && $wgBlockCIDRLimit['IPv4'] != 32 ) { |
| 438 | 438 | if( !IP::isIPv4( $this->BlockAddress ) || $matches[2] > 32 ) { |
| 439 | 439 | return array( 'ip_range_invalid' ); |
| 440 | 440 | } elseif ( $matches[2] < $wgBlockCIDRLimit['IPv4'] ) { |
| — | — | @@ -446,7 +446,7 @@ |
| 447 | 447 | } |
| 448 | 448 | } elseif( preg_match( "/^($rxIP6)\\/(\\d{1,3})$/", $this->BlockAddress, $matches ) ) { |
| 449 | 449 | # IPv6 |
| 450 | | - if( $wgSysopRangeBans ) { |
| | 450 | + if( $wgSysopRangeBans && $wgBlockCIDRLimit['IPv6'] != 128 ) { |
| 451 | 451 | if( !IP::isIPv6( $this->BlockAddress ) || $matches[2] > 128 ) { |
| 452 | 452 | return array( 'ip_range_invalid' ); |
| 453 | 453 | } elseif( $matches[2] < $wgBlockCIDRLimit['IPv6'] ) { |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -109,6 +109,12 @@ |
| 110 | 110 | which should be resolved by the 1.18 release |
| 111 | 111 | * $wgCopyrightIcon is deprecated and $wgFooterIcons['copyright']['copyright'] should |
| 112 | 112 | be used instead. |
| | 113 | +* $wgSysopUserBans is deprecated, and will be made permanently true in 1.18. |
| | 114 | + If you need this functionality, you should use the BlockIp hook to filter and |
| | 115 | + reject such blocks. |
| | 116 | +* $wgSysopRangeBans is deprecated, you should set $wgBlockCIDRLimit to maximum |
| | 117 | + (32 for IPv4, 128 for IPv6), equivalent to allowing rangeblocks of only 1 |
| | 118 | + address at a time. |
| 113 | 119 | |
| 114 | 120 | === New features in 1.17 === |
| 115 | 121 | * (bug 10183) Users can now add personal styles and scripts to all skins via |