From 4332912e7e10f05e873d7995dea4d6f151978eca Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Wed, 13 Dec 2006 05:44:46 +0000 Subject: [PATCH] Include the block ID in blockedtext. This way, users can get themselves unblocked without revealing their IP addresses. --- includes/OutputPage.php | 4 +++- languages/messages/MessagesEn.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index a314b554dc..57f0b67472 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -711,7 +711,9 @@ class OutputPage { } $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 if( $return ) { diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index e5fb2a1b8b..79e7357f29 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -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 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:", 'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:", 'whitelistedittitle' => 'Login required to edit', -- 2.20.1