From: Daniel Cannon Date: Fri, 1 Jun 2007 09:05:03 +0000 (+0000) Subject: Fixes for previous commit: X-Git-Tag: 1.31.0-rc.0~52735 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=474509113a4c571f2cc72899168fabc52c7359ad;p=lhc%2Fweb%2Fwiklou.git 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 a8c5365535..a86132d942 100644 --- 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 f7030ee40f..99d681f6d9 100644 --- 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 eb2cac35c0..d5a919ca4a 100644 --- 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