From 2add870ee887d0a16a8ae2c80af9d10ab193af3e Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 15 Feb 2010 12:20:52 +0000 Subject: [PATCH] Fix r62511: always select ipb_auto field --- includes/api/ApiQueryBlocks.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/api/ApiQueryBlocks.php b/includes/api/ApiQueryBlocks.php index e720e82c22..06091633c2 100644 --- a/includes/api/ApiQueryBlocks.php +++ b/includes/api/ApiQueryBlocks.php @@ -64,10 +64,12 @@ class ApiQueryBlocks extends ApiQueryBase { $data = array(); $this->addTables( 'ipblocks' ); + $this->addFields( 'ipb_auto' ); + if ( $fld_id ) $this->addFields( 'ipb_id' ); if ( $fld_user ) - $this->addFields( array( 'ipb_address', 'ipb_user', 'ipb_auto' ) ); + $this->addFields( array( 'ipb_address', 'ipb_user' ) ); if ( $fld_by ) { $this->addTables( 'user' ); @@ -83,7 +85,7 @@ class ApiQueryBlocks extends ApiQueryBase { if ( $fld_range ) $this->addFields( array( 'ipb_range_start', 'ipb_range_end' ) ); if ( $fld_flags ) - $this->addFields( array( 'ipb_auto', 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ) ); + $this->addFields( array( 'ipb_anon_only', 'ipb_create_account', 'ipb_enable_autoblock', 'ipb_block_email', 'ipb_deleted', 'ipb_allow_usertalk' ) ); $this->addOption( 'LIMIT', $params['limit'] + 1 ); $this->addWhereRange( 'ipb_timestamp', $params['dir'], $params['start'], $params['end'] ); -- 2.20.1