From b4f578f76401e33011ff4b3a18bd702a5d9d410a Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Sat, 3 Nov 2007 15:50:11 +0000 Subject: [PATCH] API: * Alphabetic ordering in AutoLoader.php * Using ApiBase::getModuleName in ApiRender and ApiExpandTemplates --- includes/AutoLoader.php | 2 +- includes/api/ApiExpandTemplates.php | 2 +- includes/api/ApiRender.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index e1534fe19b..10709378d7 100644 --- 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 1d5d75074f..df99ba1099 100644 --- 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 933beb2951..9302da392a 100644 --- 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() { -- 2.20.1