From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 18 Jan 2007 13:36:51 +0000 (+0000)
Subject: (bug 8688) Handle underscores/spaces in Special:Blockip and Special:Ipblocklist in... 
X-Git-Tag: 1.31.0-rc.0~54312
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/?a=commitdiff_plain;h=3ff63c98510ac35d1a055f901afa44a7123e1311;p=lhc%2Fweb%2Fwiklou.git

(bug 8688) Handle underscores/spaces in Special:Blockip and Special:Ipblocklist in a consistent manner
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f34fc24743..d6f6618455 100644
--- 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 3dcdbd09f8..1907c164ad 100644
--- 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 293059f290..09531390b6 100644
--- 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;
 	}