From: Daniel Cannon <amidaniel@users.mediawiki.org>
Date: Fri, 1 Jun 2007 07:57:17 +0000 (+0000)
Subject: (bug 10076) If a user is blocked as the result of a rangeblock, add the effective... 
X-Git-Tag: 1.31.0-rc.0~52736
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=2aba2fcdaf86296f08e195e05de4818d1ecc6691;p=lhc%2Fweb%2Fwiklou.git

(bug 10076) If a user is blocked as the result of a rangeblock, add the effective rangeblock to the output of MediaWiki:Blockedtext
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c86180aa32..f7030ee40f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -792,7 +792,12 @@ class OutputPage {
 			$msg = 'blockedtext';
 		}
 
-		$this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry ) );
+		//If it's a range block, get the range in CIDR and hand it back.
+		if ($wgUser->mBlock->mRangeStart != $wgUser->mBlock->mRangeEnd) {
+			$ipRange = $wgUser->mBlock->mAddress;
+		}
+
+		$this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $ipRange ) );
 		
 		# Don't auto-return to special pages
 		if( $return ) {