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

Include the block ID in blockedtext. This way, users can get themselves unblocked without revealing their IP addresses.

Browse source
This commit is contained in:
Andrew Garrett 2006-12-13 05:44:46 +00:00
parent 64ce6148e6
commit 4332912e7e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/OutputPage.php
View file

@ -711,7 +711,9 @@ class OutputPage {
} }
$link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]"; $link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]";
$this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) ); $blockid = $wgUser->mBlock->mId;
$this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name, $blockid ) );
# Don't auto-return to special pages # Don't auto-return to special pages
if( $return ) { if( $return ) {

2
languages/messages/MessagesEn.php
View file

@ -924,7 +924,7 @@ The block was made by $1. The reason given is ''$2''.
You can contact $1 or another [[{{ns:project}}:Administrators|administrator]] to discuss the block. You can contact $1 or another [[{{ns:project}}:Administrators|administrator]] to discuss the block.
You cannot use the 'email this user' feature unless a valid email address is specified in your You cannot use the 'email this user' feature unless a valid email address is specified in your
[[Special:Preferences|account preferences]]. Your current IP address is $3. Please include this in any queries.", [[Special:Preferences|account preferences]]. Your current IP address is $3, and the block ID is #$5. Please include either or both of these in any queries.",
'blockedoriginalsource' => "The source of '''$1''' is shown below:", 'blockedoriginalsource' => "The source of '''$1''' is shown below:",
'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:", 'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:",
'whitelistedittitle' => 'Login required to edit', 'whitelistedittitle' => 'Login required to edit',