Include the block ID in blockedtext. This way, users can get themselves unblocked...

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a314b55..57f0b67 100644 (file)
--- 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 e5fb2a1..79e7357 100644 (file)
--- 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',