Followup to r70584: Use fourth parameter of ApiQueryBase::addWhereRange instead of...

diff --git a/includes/api/ApiQueryAllCategories.php b/includes/api/ApiQueryAllCategories.php
index a549294..a8f09b1 100644 (file)
--- a/includes/api/ApiQueryAllCategories.php
+++ b/includes/api/ApiQueryAllCategories.php
@@ -59,12 +59,10 @@ class ApiQueryAllCategories extends ApiQueryGeneratorBase {
                $this->addTables( 'category' );
                $this->addFields( 'cat_title' );
 
-               $fromdir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
-               $todir = ( $params['dir'] != 'descending' ? 'older' : 'newer' );
+               $dir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
                $from = ( is_null( $params['from'] ) ? null : $this->titlePartToKey( $params['from'] ) );
                $to = ( is_null( $params['to'] ) ? null : $this->titlePartToKey( $params['to'] ) );
-               $this->addWhereRange( 'cat_title', $fromdir, $from, null );
-               $this->addWhereRange( 'cat_title', $todir, $to, null );
+               $this->addWhereRange( 'cat_title', $dir, $from, $to );
 
                if ( isset( $params['prefix'] ) ) {
                        $this->addWhere( 'cat_title' . $db->buildLike( $this->titlePartToKey( $params['prefix'] ), $db->anyString() ) );

diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 863cd59..0abb330 100644 (file)
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -78,12 +78,10 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
                $params = $this->extractRequestParams();
 
                // Image filters
-               $fromdir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
-               $todir = ( $params['dir'] != 'descending' ? 'older' : 'newer' );
+               $dir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
                $from = ( is_null( $params['from'] ) ? null : $this->titlePartToKey( $params['from'] ) );
                $to = ( is_null( $params['to'] ) ? null : $this->titlePartToKey( $params['to'] ) );
-               $this->addWhereRange( 'img_name', $fromdir, $from, null );
-               $this->addWhereRange( 'img_name', $todir, $to, null );
+               $this->addWhereRange( 'img_name', $dir, $from, $to );
 
                if ( isset( $params['prefix'] ) )
                        $this->addWhere( 'img_name' . $db->buildLike( $this->titlePartToKey( $params['prefix'] ), $db->anyString() ) );

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 7b2a474..c1919f2 100644 (file)
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -70,12 +70,11 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                }
 
                $this->addWhereFld( 'page_namespace', $params['namespace'] );
-               $fromdir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
-               $todir = ( $params['dir'] != 'descending' ? 'older' : 'newer' );
+               $dir = ( $params['dir'] == 'descending' ? 'older' : 'newer' );
                $from = ( is_null( $params['from'] ) ? null : $this->titlePartToKey( $params['from'] ) );
                $to = ( is_null( $params['to'] ) ? null : $this->titlePartToKey( $params['to'] ) );
-               $this->addWhereRange( 'page_title', $fromdir, $from, null );
-               $this->addWhereRange( 'page_title', $todir, $to, null );
+               $this->addWhereRange( 'page_title', $dir, $from, $to );
+               
 
                if ( isset( $params['prefix'] ) ) {
                        $this->addWhere( 'page_title' . $db->buildLike( $this->titlePartToKey( $params['prefix'] ), $db->anyString() ) );