| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -792,13 +792,11 @@ |
| 793 | 793 | $msg = 'blockedtext'; |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | | - //If it's a range block, get the range in CIDR and hand it back. |
| 797 | | - $ipRange = ''; |
| 798 | | - if ($wgUser->mBlock->mRangeStart != $wgUser->mBlock->mRangeEnd) { |
| 799 | | - $ipRange = $wgUser->mBlock->mAddress; |
| 800 | | - } |
| | 796 | + /* $ip returns who *is* being blocked, $intended contains who was meant to be blocked. |
| | 797 | + * This could be a username, an ip range, or a single ip. */ |
| | 798 | + $intended = $wgUser->mBlock->mAddress; |
| 801 | 799 | |
| 802 | | - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $ipRange ) ); |
| | 800 | + $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) ); |
| 803 | 801 | |
| 804 | 802 | # Don't auto-return to special pages |
| 805 | 803 | if( $return ) { |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -939,8 +939,8 @@ |
| 940 | 940 | |
| 941 | 941 | The block was made by $1. The reason given is ''$2''. |
| 942 | 942 | |
| 943 | | -Expiry of block: $6 |
| 944 | | -Effective range: $7 |
| | 943 | +Expiry of block: $6 |
| | 944 | +Intended blockee: $7 |
| 945 | 945 | |
| 946 | 946 | You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block. |
| 947 | 947 | You cannot use the 'email this user' feature unless a valid email address is specified in your |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -50,8 +50,8 @@ |
| 51 | 51 | * Display file history on local image description pages of shared images |
| 52 | 52 | * Added $wgArticleRobotPolicies |
| 53 | 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. |
| | 54 | + containing, the ip, ip range, or username whose block is affecting the |
| | 55 | + current user. |
| 56 | 56 | |
| 57 | 57 | == Bugfixes since 1.10 == |
| 58 | 58 | |