* (bug 1429) Stop double-escaping of block comments; fix formatting

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index e95f8aa..e83e990 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -160,7 +160,7 @@ class IPBlockForm {
                # Note: for a user block, ipb_address is only for display purposes
 
                $ban = new Block( $this->BlockAddress, $userId, $wgUser->getID(), 
-                       wfStrencode( $this->BlockReason ), wfTimestampNow(), 0, $expiry );
+                       $this->BlockReason, wfTimestampNow(), 0, $expiry );
                
                if (wfRunHooks('BlockIp', $ban, $wgUser)) {
                        

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 71f8ec1..8f1129b 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -169,7 +169,7 @@ function wfAddRow( $block, $tag ) {
                $wgOut->addHTML( " ({$ublink})" );
        }
        if ( "" != $block->mReason ) {
-               $wgOut->addHTML( " <em>(" . htmlspecialchars( $block->mReason ) .
+               $wgOut->addHTML( " <em>(" . $sk->formatComment( $block->mReason ) .
                  ")</em>" );
        }
        $wgOut->addHTML( "</li>\n" );