Fix broken and double escaping in r44657.

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 2e9fc21..06a5ec0 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -273,10 +273,10 @@ class LogEventsList {
                                $this->skin->link( SpecialPage::getTitleFor( 'Ipblocklist' ),
                                        $this->message['unblocklink'],
                                        array(),
-                                       array( 'action' => 'unblock', 'ip' => urlencode( $row->log_title ) ),
+                                       array( 'action' => 'unblock', 'ip' => $row->log_title ),
                                        'known' ) 
                                . ' ' . wfMsg( 'pipe-separator' ) . ' ' .
-                               $this->skin->link( SpecialPage::getTitleFor( 'Blockip', htmlspecialchars( $row->log_title ) ), 
+                               $this->skin->link( SpecialPage::getTitleFor( 'Blockip', $row->log_title ), 
                                        $this->message['change-blocklink'],
                                        array(), array(), 'known' ) .
                                ')';

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 6dab84a..de27dbf 100644 (file)
--- a/includes/specials/SpecialIpblocklist.php
+++ b/includes/specials/SpecialIpblocklist.php
@@ -428,13 +428,13 @@ class IPUnblockForm {
                        $unblocklink = $sk->link( SpecialPage::getTitleFor( 'Ipblocklist' ),
                                        $msg['unblocklink'],
                                        array(),
-                                       array( 'action' => 'unblock', 'id' => urlencode( $block->mId ) ),
+                                       array( 'action' => 'unblock', 'id' => $block->mId ),
                                        'known' );
 
                        # Create changeblocklink for all blocks with exception of autoblocks
                        if( !$block->mAuto ) {
                                $changeblocklink = ' ' . wfMsg( 'pipe-separator' ) . ' ' .
-                                       $sk->link( SpecialPage::getTitleFor( 'Blockip', htmlspecialchars( $block->mAddress ) ), 
+                                       $sk->link( SpecialPage::getTitleFor( 'Blockip', $block->mAddress ), 
                                                $msg['change-blocklink'],
                                                array(), array(), 'known' );
                        }