Fixes for previous commit:

* Forgot to commit RELEASE-NOTES and MessagesEn.php
* Teeny tiny bug -- defined variable $ipRange in an if-block

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a8c5365..a86132d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -49,7 +49,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Improved thumb.php error handling
 * 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.
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index f7030ee..99d681f 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -793,6 +793,7 @@ class OutputPage {
                }
 
                //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;
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index eb2cac3..d5a919c 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -940,6 +940,7 @@ 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
 
 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