* IP privacy fix for blocklist search on autoblocks

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d8a2c13..bc3a62f 100644 (file)
--- 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 f8b78d7..ad76832 100644 (file)
--- 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;
+                               }
                        }
                }