(bug 8688) Handle underscores/spaces in Special:Blockip and Special:Ipblocklist in...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f34fc24..d6f6618 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -119,6 +119,8 @@ lighter making things easier to read.
 * (bug 8673) Minor fix for web service API content-type header
 * Fix API revision list on PHP 5.2.1; bad reference assignment
 * (bug 8136) Introduce 'ArticleUndelete' hook; see docs/hooks.txt for more info
+* (bug 8688) Handle underscores/spaces in Special:Blockip and Special:Ipblocklist
+  in a consistent manner
 
 == Languages updated ==
 

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 3dcdbd0..1907c16 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -43,6 +43,7 @@ class IPBlockForm {
                global $wgRequest;
 
                $this->BlockAddress = $wgRequest->getVal( 'wpBlockAddress', $wgRequest->getVal( 'ip', $par ) );
+               $this->BlockAddress = strtr( $this->BlockAddress, '_', ' ' );
                $this->BlockReason = $wgRequest->getText( 'wpBlockReason' );
                $this->BlockExpiry = $wgRequest->getVal( 'wpBlockExpiry', wfMsg('ipbotheroption') );
                $this->BlockOther = $wgRequest->getVal( 'wpBlockOther', '' );

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 293059f..0953139 100644 (file)
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -44,7 +44,7 @@ class IPUnblockForm {
        var $ip, $reason, $id;
 
        function IPUnblockForm( $ip, $id, $reason ) {
-               $this->ip = $ip;
+               $this->ip = strtr( $ip, '_', ' ' );
                $this->id = $id;
                $this->reason = $reason;
        }