Don't show 'autoblock disabled' for IP blocks

diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php
index 964c63e..89f3dad 100644 (file)
--- 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',