From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Wed, 8 Nov 2006 13:21:43 +0000 (+0000)
Subject: (bug 7833) Fix regression causing 'autoblock disabled' to not appear where appropriat... 
X-Git-Tag: 1.31.0-rc.0~55249
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=8a579552fb11d257d4f8103eb76daccd3c35175f;p=lhc%2Fweb%2Fwiklou.git

(bug 7833) Fix regression causing 'autoblock disabled' to not appear where appropriate on Ipblocklist introduced in r17381.
---

diff --git a/includes/SpecialIpblocklist.php b/includes/SpecialIpblocklist.php
index 85764be909..9b10f42ca3 100644
--- a/includes/SpecialIpblocklist.php
+++ b/includes/SpecialIpblocklist.php
@@ -277,7 +277,7 @@ class IPUnblockForm {
 		if ( $block->mCreateAccount ) {
 			$properties[] = $msg['createaccountblock'];
 		}
-		if (!$block->mEnableAutoblock && !$block->mAddress ) {
+		if (!$block->mEnableAutoblock && $block->mUser ) {
 			$properties[] = $msg['noautoblockblock'];
 		}