From 9081f7e6d05dcb6e6296f1fe0cd0ef312680304c Mon Sep 17 00:00:00 2001 From: Reedy Date: Tue, 10 Apr 2012 14:01:30 +0100 Subject: [PATCH] Normalise categorymembers to take ascending/descending for direction, also adding newer/older to make it like other modules Change-Id: I50c770b8d48548988a71bcf62b76a9c43fc1622f --- includes/api/ApiQueryCategoryMembers.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php index 4b19b7e86e..fb1237f9d6 100644 --- a/includes/api/ApiQueryCategoryMembers.php +++ b/includes/api/ApiQueryCategoryMembers.php @@ -107,7 +107,7 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { $this->addWhereFld( 'page_namespace', $params['namespace'] ); } - $dir = $params['dir'] == 'asc' ? 'newer' : 'older'; + $dir = in_array( $params['dir'], array( 'asc', 'ascending', 'newer' ) ) ? 'newer' : 'older'; if ( $params['sort'] == 'timestamp' ) { $this->addWhereRange( 'cl_timestamp', @@ -313,10 +313,15 @@ class ApiQueryCategoryMembers extends ApiQueryGeneratorBase { ) ), 'dir' => array( - ApiBase::PARAM_DFLT => 'asc', + ApiBase::PARAM_DFLT => 'ascending', ApiBase::PARAM_TYPE => array( 'asc', - 'desc' + 'desc', + // Normalising with other modules + 'ascending', + 'descending', + 'newer', + 'older', ) ), 'start' => array( -- 2.20.1