r22624 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r22623‎ | r22624 | r22625 >
Date:09:05, 1 June 2007
Author:amidaniel
Status:old
Tags:
Comment:
Fixes for previous commit:
* Forgot to commit RELEASE-NOTES and MessagesEn.php
* Teeny tiny bug -- defined variable $ipRange in an if-block
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/OutputPage.php (modified) (history)
  • /trunk/phase3/languages/messages/MessagesEn.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -793,6 +793,7 @@
794794 }
795795
796796 //If it's a range block, get the range in CIDR and hand it back.
 797+ $ipRange;
797798 if ($wgUser->mBlock->mRangeStart != $wgUser->mBlock->mRangeEnd) {
798799 $ipRange = $wgUser->mBlock->mAddress;
799800 }
Index: trunk/phase3/languages/messages/MessagesEn.php
@@ -940,6 +940,7 @@
941941 The block was made by $1. The reason given is ''$2''.
942942
943943 Expiry of block: $6
 944+Effective range: $7
944945
945946 You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block.
946947 You cannot use the 'email this user' feature unless a valid email address is specified in your
Index: trunk/phase3/RELEASE-NOTES
@@ -49,8 +49,10 @@
5050 * Improved thumb.php error handling
5151 * Display file history on local image description pages of shared images
5252 * Added $wgArticleRobotPolicies
 53+* (bug 10076) Additional parameter $7 added to MediaWiki:Blockedtext
 54+ containing, if the user is blocked as the result of a range-block, the
 55+ range whose block effects the user.
5356
54 -
5557 == Bugfixes since 1.10 ==
5658
5759 * (bug 9712) Use Arabic comma in date/time formats for Arabic and Farsi

Follow-up revisions

RevisionCommit summaryAuthorDate
r22652Merged revisions 22619-22651 via svnmerge from...david06:10, 2 June 2007