* 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 ==
$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 ) {
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