From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 9 Jun 2008 22:35:17 +0000 (+0000)
Subject: Minor logic error on removing blocks on range when tweaking an IP.
X-Git-Tag: 1.31.0-rc.0~47089
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=9fc6772089a07ce8c842ca2d96f23318918a8fd3;p=lhc%2Fweb%2Fwiklou.git

Minor logic error on removing blocks on range when tweaking an IP.
---

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 620fd80979..495ee745f5 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -388,7 +388,7 @@ class IPBlockForm {
 
 		if ( wfRunHooks('BlockIp', array(&$block, &$wgUser)) ) {
 
-			if ( $oldblock = Block::newFromDB( $this->BlockAddress ) ) {
+			if ( $oldblock = Block::newFromDB( $this->BlockAddress ) && $oldblock->mAddress == $this->BlockAddress  ) {
 				$oldblock->delete(); // Block already exists. Silently delete it
 			}
 			$block->insert();