(bug 10076) Modified so as to output whoever the original blockee is, regardless...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a570a06..fa68540 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -50,8 +50,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Display file history on local image description pages of shared images
 * Added $wgArticleRobotPolicies
 * (bug 10076) Additional parameter $7 added to MediaWiki:Blockedtext 
-  containing, if the user is blocked as the result of a range-block, the
-  range whose block effects the user.
+  containing, the ip, ip range, or username whose block is affecting the
+  current user.
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index f243392..399c8ed 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -792,13 +792,11 @@ class OutputPage {
                        $msg = 'blockedtext';
                }
 
-               //If it's a range block, get the range in CIDR and hand it back.
-               $ipRange = '';
-               if ($wgUser->mBlock->mRangeStart != $wgUser->mBlock->mRangeEnd) {
-                       $ipRange = $wgUser->mBlock->mAddress;
-               }
+               /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked.
+                * This could be a username, an ip range, or a single ip. */
+               $intended = $wgUser->mBlock->mAddress;
 
-               $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $ipRange ) );
+               $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) );
                
                # Don't auto-return to special pages
                if( $return ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d5a919c..35ffd8b 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -939,8 +939,8 @@ format. Please enter a well-formatted address or empty that field.',
 
 The block was made by $1. The reason given is ''$2''.
 
-Expiry of block: $6
-Effective range: $7
+Expiry of block:  $6
+Intended blockee: $7
 
 You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block.
 You cannot use the 'email this user' feature unless a valid email address is specified in your