Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(bug 10076) Modified so as to output whoever the original blockee is, regardless of whether it is an IP-range or not.

Browse source
This commit is contained in:
Daniel Cannon 2007-06-02 00:03:22 +00:00
parent f60fff435f
commit 8ccb28a453
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RELEASE-NOTES
View file

@ -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 ==

10
includes/OutputPage.php
View file

@ -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 ) {

4
languages/messages/MessagesEn.php
View file

@ -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