From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 6 Oct 2011 22:57:32 +0000 (+0000)
Subject: Don't add 'autoblock disabled' flag for IP range blocks
X-Git-Tag: 1.31.0-rc.0~27214
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=7ecebdc787a7f649aa1a00e33a93e891d87698a2;p=lhc%2Fweb%2Fwiklou.git

Don't add 'autoblock disabled' flag for IP range blocks
---

diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php
index 2bae9a6d1a..9c6674ae37 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -826,7 +826,7 @@ class SpecialBlock extends SpecialPage {
 	 * Return a comma-delimited list of "flags" to be passed to the log
 	 * reader for this block, to provide more information in the logs
 	 * @param $data Array from HTMLForm data
-	 * @param $type Block::TYPE_ constant
+	 * @param $type Block::TYPE_ constant (USER, RANGE, or IP)
 	 * @return array
 	 */
 	protected static function blockLogFlags( array $data, $type ) {
@@ -845,7 +845,7 @@ class SpecialBlock extends SpecialPage {
 		}
 
 		# Same as anononly, this is not displayed when blocking an IP address
-		if( !$data['AutoBlock'] && $type != Block::TYPE_IP ){
+		if( !$data['AutoBlock'] && $type == Block::TYPE_USER ){
 			// For grepping: message block-log-flags-noautoblock
 			$flags[] = 'noautoblock';
 		}