From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 29 Aug 2005 02:19:22 +0000 (+0000)
Subject: * IP privacy fix for blocklist search on autoblocks
X-Git-Tag: 1.6.0~1766
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=dd0b5aa137812eb3bb41768971e3b8427cbb197e;p=lhc%2Fweb%2Fwiklou.git

* IP privacy fix for blocklist search on autoblocks
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d8a2c13d72..bc3a62ff84 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -70,6 +70,7 @@ fully support the editing toolbar, but was found to be too confusing.
   $wgFilterRobotsWL = true.
 * (bug 2885) More PHP 5.1 fixes: skin, search, log, undelete
 * Fix interlanguage links on special pages when extra namespaces configured
+* IP privacy fix for blocklist search on autoblocks
 
 
 === Caveats ===
diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index f8b78d7c8a..ad76832cec 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -177,8 +177,14 @@ class IPUnblockForm {
 		global $wgOut, $wgUser, $wgLang, $wgContLang;
 		
 		if( $this->ip != '' ) {
-			if( stristr( $block->mAddress, $this->ip ) == false ) {
-				return;
+			if( $block->mAuto ) {
+				if( stristr( $block->mId, $this->ip ) == false ) {
+					return;
+				}
+			} else {
+				if( stristr( $block->mAddress, $this->ip ) == false ) {
+					return;
+				}
 			}
 		}