From: John Du Hart <johnduhart@users.mediawiki.org>
Date: Tue, 23 Aug 2011 18:40:04 +0000 (+0000)
Subject: (bug 30352) Add option to BlockList to filter out IP range blocks
X-Git-Tag: 1.31.0-rc.0~28123
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=dad0a24b7be2dc4e83d1ba21b98ae935b108d6ea;p=lhc%2Fweb%2Fwiklou.git

(bug 30352) Add option to BlockList to filter out IP range blocks
---

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index a7b99e7f6d..76915df245 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -75,6 +75,7 @@ class SpecialBlockList extends SpecialPage {
 					wfMsg( 'blocklist-userblocks' ) => 'userblocks',
 					wfMsg( 'blocklist-tempblocks' ) => 'tempblocks',
 					wfMsg( 'blocklist-addressblocks' ) => 'addressblocks',
+					wfMsg( 'blocklist-rangeblocks' ) => 'rangeblocks',
 				),
 				'flatlist' => true,
 			),
@@ -142,6 +143,9 @@ class SpecialBlockList extends SpecialPage {
 		if( in_array( 'addressblocks', $this->options ) ) {
 			$conds[] = "ipb_user != 0 OR ipb_range_end > ipb_range_start";
 		}
+		if( in_array( 'rangeblocks', $this->options ) ) {
+			$conds[] = "ipb_range_end = ipb_range_start";
+		}
 
 		# Check for other blocks, i.e. global/tor blocks
 		$otherBlockLink = array();
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 9880f3e361..22a153ca99 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3084,6 +3084,7 @@ See [[Special:BlockList|IP block list]] to review blocks.',
 'blocklist-userblocks'            => 'Hide account blocks',
 'blocklist-tempblocks'            => 'Hide temporary blocks',
 'blocklist-addressblocks'         => 'Hide single IP blocks',
+'blocklist-rangeblocks'           => 'Hide range blocks',
 'blocklist-timestamp'             => 'Timestamp',
 'blocklist-target'                => 'Target',
 'blocklist-expiry'                => 'Expires',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 561a99adb2..2d89268798 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2102,6 +2102,7 @@ $wgMessageStructure = array(
 		'blocklist-userblocks',
 		'blocklist-tempblocks',
 		'blocklist-addressblocks',
+		'blocklist-rangeblocks',
 		'blocklist-timestamp',
 		'blocklist-target',
 		'blocklist-expiry',