Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

[lhc/web/wiklou.git] / includes / api / ApiQueryDuplicateFiles.php

diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php
index 0132d67..6fb3ea3 100644 (file)
--- a/includes/api/ApiQueryDuplicateFiles.php
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -91,14 +91,14 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
                        );
                }
 
-               $dir = ( $params['dir'] == 'descending' ? ' DESC' : '' );
+               $sort = ( $params['dir'] == 'descending' ? ' DESC' : '' );
                // Don't order by i1.img_name if it's constant in the WHERE clause
                if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) {
-                       $this->addOption( 'ORDER BY', 'i2.img_name' . $dir );
+                       $this->addOption( 'ORDER BY', 'i2.img_name' . $sort );
                } else {
                        $this->addOption( 'ORDER BY', array(
-                                       'i1.img_name' . $dir,
-                                       'i2.img_name' . $dir
+                                       'i1.img_name' . $sort,
+                                       'i2.img_name' . $sort
                        ));
                }
                $this->addOption( 'LIMIT', $params['limit'] + 1 );