From d89ed3f20bd42fb4505ef6946bbda343c120f49d Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Fri, 14 Jan 2011 22:37:12 +0000 Subject: [PATCH] Fix indenting, rearrange some where statements --- includes/api/ApiQueryCategoryMembers.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php index 45268aed1a..5ac888ef3f 100644 --- a/includes/api/ApiQueryCategoryMembers.php +++ b/includes/api/ApiQueryCategoryMembers.php @@ -90,9 +90,9 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { $this->addFieldsIf( 'cl_timestamp', $fld_timestamp || $params['sort'] == 'timestamp' ); $this->addFieldsIf( 'cl_type', $fld_type ); + $this->addTables( array( 'page', 'categorylinks' ) ); // must be in this order for 'USE INDEX' - $this->addWhere( 'cl_from=page_id' ); $this->setContinuation( $params['continue'], $params['dir'] ); $this->addWhereFld( 'cl_to', $categoryTitle->getDBkey() ); @@ -112,21 +112,23 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { if ( $params['sort'] == 'timestamp' ) { $this->addWhereRange( 'cl_timestamp', - $dir, - $params['start'], - $params['end'] ); + $dir, + $params['start'], + $params['end'] ); $this->addOption( 'USE INDEX', 'cl_timestamp' ); } else { $this->addWhereRange( 'cl_sortkey', - $dir, - $params['startsortkey'], - $params['endsortkey'] ); + $dir, + $params['startsortkey'], + $params['endsortkey'] ); $this->addWhereRange( 'cl_from', $dir, null, null ); $this->addOption( 'USE INDEX', 'cl_sortkey' ); } + $this->addWhere( 'cl_from=page_id' ); + $limit = $params['limit']; $this->addOption( 'LIMIT', $limit + 1 ); -- 2.20.1