Normalise categorymembers to take ascending/descending for direction, also adding...

Change-Id: I50c770b8d48548988a71bcf62b76a9c43fc1622f

diff --git a/includes/api/ApiQueryCategoryMembers.php b/includes/api/ApiQueryCategoryMembers.php
index 4b19b7e..fb1237f 100644 (file)
--- 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(