Cleanup from r37839: just put ipb_auto in the relevant arrays. We have those arrays...

diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php
index f509d93..9d9a5d7 100644 (file)
--- a/includes/api/ApiQueryBlocks.php
+++ b/includes/api/ApiQueryBlocks.php
@@ -71,9 +71,7 @@ class ApiQueryBlocks extends ApiQueryBase {
                if($fld_id)
                        $this->addFields('ipb_id');
                if($fld_user)
-                       $this->addFields(array('ipb_address', 'ipb_user'));
-               if($fld_user || $fld_flags)
-                       $this->addFields('ipb_auto');
+                       $this->addFields(array('ipb_address', 'ipb_user', 'ipb_auto'));
                if($fld_by)
                {
                        $this->addTables('user');
@@ -89,7 +87,7 @@ class ApiQueryBlocks extends ApiQueryBase {
                if($fld_range)
                        $this->addFields(array('ipb_range_start', 'ipb_range_end'));
                if($fld_flags)
-                       $this->addFields(array('ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted'));
+                       $this->addFields(array('ipb_auto', 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted'));
 
                $this->addOption('LIMIT', $params['limit'] + 1);
                $this->addWhereRange('ipb_timestamp', $params['dir'], $params['start'], $params['end']);