aboutsummaryrefslogtreecommitdiffstats
path: root/includes/api/ApiQueryBase.php
diff options
context:
space:
mode:
authorRoan Kattouw <catrope@users.mediawiki.org>2011-11-14 08:19:55 +0000
committerRoan Kattouw <catrope@users.mediawiki.org>2011-11-14 08:19:55 +0000
commit2563e19c39a2d7e28860e99b46b459734d0a247e (patch)
treef6d1c1969ec811c78f419cf00272d751dba34ab5 /includes/api/ApiQueryBase.php
parent6ff2162ffee7a8e84ce1f102eac5cd0f5d1b5f94 (diff)
downloadmediawikicore-2563e19c39a2d7e28860e99b46b459734d0a247e.tar.gz
mediawikicore-2563e19c39a2d7e28860e99b46b459734d0a247e.zip
(bug 26909) Add dir parameter for prop= API modules. Modified patch by Umherirrender
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/102947
Diffstat (limited to 'includes/api/ApiQueryBase.php')
-rw-r--r--includes/api/ApiQueryBase.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index daadcaad1771..49db0c2ced7d 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -214,11 +214,10 @@ abstract class ApiQueryBase extends ApiBase {
if ( $sort ) {
$order = $field . ( $isDirNewer ? '' : ' DESC' );
- if ( !isset( $this->options['ORDER BY'] ) ) {
- $this->addOption( 'ORDER BY', $order );
- } else {
- $this->addOption( 'ORDER BY', $this->options['ORDER BY'] . ', ' . $order );
- }
+ // Append ORDER BY
+ $optionOrderBy = isset( $this->options['ORDER BY'] ) ? (array)$this->options['ORDER BY'] : array();
+ $optionOrderBy[] = $order;
+ $this->addOption( 'ORDER BY', $optionOrderBy );
}
}