API:

* Alphabetic ordering in AutoLoader.php
* Using ApiBase::getModuleName in ApiRender and ApiExpandTemplates

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index e1534fe..1070937 100644 (file)
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -294,6 +294,7 @@ function __autoload($className) {
 
                # API
                'ApiBase' => 'includes/api/ApiBase.php',
+               'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php',
                'ApiFormatFeedWrapper' => 'includes/api/ApiFormatBase.php',
                'ApiFeedWatchlist' => 'includes/api/ApiFeedWatchlist.php',
                'ApiFormatBase' => 'includes/api/ApiFormatBase.php',
@@ -308,7 +309,6 @@ function __autoload($className) {
                'ApiLogin' => 'includes/api/ApiLogin.php',
                'ApiMain' => 'includes/api/ApiMain.php',
                'ApiOpenSearch' => 'includes/api/ApiOpenSearch.php',
-               'ApiExpandTemplates' => 'includes/api/ApiExpandTemplates.php',
                'ApiPageSet' => 'includes/api/ApiPageSet.php',
                'ApiQuery' => 'includes/api/ApiQuery.php',
                'ApiQueryAllpages' => 'includes/api/ApiQueryAllpages.php',

diff --git a/includes/api/ApiExpandTemplates.php b/includes/api/ApiExpandTemplates.php
index 1d5d750..df99ba1 100644 (file)
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -57,7 +57,7 @@ class ApiExpandTemplates extends ApiBase {
                $result = $this->getResult();
                $retval_array = array();
                $result->setContent( $retval_array, $retval );
-               $result->addValue( null, 'expandtemplates', $retval_array );
+               $result->addValue( null, $this->getModuleName(), $retval_array );
        }
 
        protected function getAllowedParams() {

diff --git a/includes/api/ApiRender.php b/includes/api/ApiRender.php
index 933beb2..9302da3 100644 (file)
--- a/includes/api/ApiRender.php
+++ b/includes/api/ApiRender.php
@@ -58,7 +58,7 @@ class ApiRender extends ApiBase {
                $result = $this->getResult();
                $retval_array = array();
                $result->setContent( $retval_array, $retval );
-               $result->addValue( null, 'render', $retval_array );
+               $result->addValue( null, $this->getModuleName(), $retval_array );
        }
 
        protected function getAllowedParams() {