API:

* Fixing buggy class instantiation in ApiParamInfo
* Adding getModules() method to ApiMain and ApiQuery

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index dff4ab9..ce69502 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -570,6 +570,13 @@ class ApiMain extends ApiBase {
        protected function addFormat( $fmtName, $fmtClass ) {
                $this->mFormats[$fmtName] = $fmtClass;
        }
+       
+       /**
+        * Get the array mapping module names to class names
+        */
+       function getModules() {
+               return $this->mModules;
+       }
 }
 
 /**

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index 2c9ef2e..b14fafc 100644 (file)
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -43,30 +43,35 @@ class ApiParamInfo extends ApiBase {
                $result = $this->getResult();\r
                $r = array();\r
                if(is_array($params['modules']))\r
+               {\r
+                       $modArr = $this->getMain()->getModules();\r
                        foreach($params['modules'] as $m)\r
                        {\r
-                               $className = "Api$m";\r
-                               if(!class_exists($className))\r
+                               if(!isset($modArr[$m]))\r
                                {\r
-                                       $mods[$m] = array('missing' => '');\r
+                                       $r['modules'][$m] = array('missing' => '');\r
                                        continue;\r
                                }\r
-                               $obj = new $className($this->getMain(), $m);\r
+                               $obj = new $modArr[$m]($this->getMain(), $m);\r
                                $r['modules'][$m] = $this->getClassInfo($obj);                          \r
                        }\r
+               }\r
                if(is_array($params['querymodules']))\r
+               {\r
+                       $queryObj = new ApiQuery($this->getMain(), 'query');\r
+                       $qmodArr = $queryObj->getModules();\r
                        foreach($params['querymodules'] as $qm)\r
                        {\r
-                               $className = "ApiQuery$qm";\r
-                               if(!class_exists($className))\r
+                               if(!isset($qmodArr[$qm]))\r
                                {\r
-                                       $qmods[$qm] = array('missing' => '');\r
+                                       $r['querymodules'][$qm] = array('missing' => '');\r
                                        continue;\r
                                }\r
-                               $obj = new $className($this, $qm);\r
+                               $obj = new $qmodArr[$qm]($this, $qm);\r
                                $r['querymodules'][$qm] = $this->getClassInfo($obj);\r
                        }\r
-               $result->addValue( null, $this->getModuleName(), $r );\r
+               }\r
+               $result->addValue(null, $this->getModuleName(), $r);\r
        }\r
 \r
        function getClassInfo($obj)\r

diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index c42e7c9..7ff6e67 100644 (file)
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -147,6 +147,13 @@ class ApiQuery extends ApiBase {
        public function getPageSet() {
                return $this->mPageSet;
        }
+       
+       /**
+        * Get the array mapping module names to class names
+        */
+       function getModules() {
+               return array_merge($this->mQueryPropModules, $this->mQueryListModules, $this->mQueryMetaModules);
+       }
 
        /**
         * Query execution happens in the following steps: