Merge "Maintenance script to check LESS files for validity"

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

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 7bb7e38..fbba98c 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -139,7 +139,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $allowException = !empty( $allowFrom );
                }
                if ( $allowException ) {
-                       $data['externalimages'] = (array) $allowFrom;
+                       $data['externalimages'] = (array)$allowFrom;
                        $this->getResult()->setIndexedTagName( $data['externalimages'], 'prefix' );
                }
 
@@ -295,6 +295,8 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                        $data[] = $item;
                }
 
+               sort( $data );
+
                $this->getResult()->setIndexedTagName( $data, 'ns' );
                return $this->getResult()->addValue( 'query', $property, $data );
        }
@@ -471,7 +473,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                global $wgFileExtensions;
 
                $data = array();
-               foreach ( $wgFileExtensions as $ext ) {
+               foreach ( array_unique( $wgFileExtensions ) as $ext ) {
                        $data[] = array( 'ext' => $ext );
                }
                $this->getResult()->setIndexedTagName( $data, 'fe' );
@@ -691,7 +693,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
                                ' extensions            - Returns extensions installed on the wiki',
                                ' fileextensions        - Returns list of file extensions allowed to be uploaded',
                                ' rightsinfo            - Returns wiki rights (license) information if available',
-                               " languages             - Returns a list of languages MediaWiki supports".
+                               " languages             - Returns a list of languages MediaWiki supports" .
                                        "(optionally localised by using {$p}inlanguagecode)",
                                ' skins                 - Returns a list of all enabled skins',
                                ' extensiontags         - Returns a list of parser extension tags',