ApiQueryBase.php: Allow queries to have a where range that does not match the range...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a693362..006c6af 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -540,6 +540,7 @@ Full API documentation is available at http://www.mediawiki.org/wiki/API
 * Added siprop=namespacealiases to meta=siteinfo
 * Made multiple values for ucuser possible in list=usercontribs
 * (bug 12944) Added cmstart and cmend parameters to list=categorymembers
+* Allow queries to have a where range that does not match the range field
 
 === Languages updated in 1.12 ===
 

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 69492db..f964ea9 100644 (file)
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -110,8 +110,9 @@ abstract class ApiQueryBase extends ApiBase {
 
                if (!is_null($end))
                        $this->addWhere($field . $before . $db->addQuotes($end));
-
-               $this->addOption('ORDER BY', $field . ($isDirNewer ? '' : ' DESC'));
+               
+               if (!isset($this->options['ORDER BY']))
+                       $this->addOption('ORDER BY', $field . ($isDirNewer ? '' : ' DESC'));
        }
 
        protected function addOption($name, $value = null) {