From 1ab9f9912a940a4764b4ad03cc961eab3e53262a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 2 Oct 2011 06:10:45 +0000
Subject: [PATCH] Don't show 'autoblock disabled' for IP blocks

---
 includes/specials/SpecialBlockList.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 964c63e2d4..89f3dadeaf 100644
--- a/includes/specials/SpecialBlockList.php
+++ b/includes/specials/SpecialBlockList.php
@@ -318,7 +318,7 @@ class BlockListPager extends TablePager {
 				if ( $row->ipb_create_account ) {
 					$properties[] = $msg['createaccountblock'];
 				}
-				if ( !$row->ipb_enable_autoblock ) {
+				if ( $row->ipb_user && !$row->ipb_enable_autoblock ) {
 					$properties[] = $msg['noautoblockblock'];
 				}
 
@@ -347,6 +347,7 @@ class BlockListPager extends TablePager {
 			'fields' => array(
 				'ipb_id',
 				'ipb_address',
+				'ipb_user',
 				'ipb_by',
 				'ipb_reason',
 				'ipb_timestamp',
-- 
2.20.1