From 249e22b721d2fb08d6803f2a9ad8332f88cf1d51 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Tue, 7 Aug 2012 19:13:55 +0100
Subject: [PATCH] Followup c17651/bug 39032

makeHelpMsgHelper made a list of "allowed generators" at the same
time as generating stuff that was used to build the api help docs.

Change-Id: Idcc0b19ff62ab8da95c09c75a5222d3116ed0dc5
---
 includes/api/ApiQuery.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index e22ef27d84..7823e2f538 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -119,6 +119,9 @@ class ApiQuery extends ApiBase {
 		$this->mPropModuleNames = array_keys( $this->mQueryPropModules );
 		$this->mListModuleNames = array_keys( $this->mQueryListModules );
 		$this->mMetaModuleNames = array_keys( $this->mQueryMetaModules );
+
+		$this->makeGeneratorList( $this->mQueryPropModules );
+		$this->makeGeneratorList( $this->mQueryListModules );
 	}
 
 	/**
@@ -615,7 +618,6 @@ class ApiQuery extends ApiBase {
 		// Make sure the internal object is empty
 		// (just in case a sub-module decides to optimize during instantiation)
 		$this->mPageSet = null;
-		$this->mAllowedGenerators = array(); // Will be repopulated
 
 		$querySeparator = str_repeat( '--- ', 12 );
 		$moduleSeparator = str_repeat( '*** ', 14 );
@@ -627,8 +629,6 @@ class ApiQuery extends ApiBase {
 		$msg .= $this->makeHelpMsgHelper( $this->mQueryMetaModules, 'meta' );
 		$msg .= "\n\n$moduleSeparator Modules: continuation  $moduleSeparator\n\n";
 
-		// Perform the base call last because the $this->mAllowedGenerators
-		// will be updated inside makeHelpMsgHelper()
 		// Use parent to make default message for the query module
 		$msg = parent::makeHelpMsg() . $msg;
 
@@ -656,7 +656,6 @@ class ApiQuery extends ApiBase {
 				$msg .= $msg2;
 			}
 			if ( $module instanceof ApiQueryGeneratorBase ) {
-				$this->mAllowedGenerators[] = $moduleName;
 				$msg .= "Generator:\n  This module may be used as a generator\n";
 			}
 			$moduleDescriptions[] = $msg;
@@ -665,6 +664,19 @@ class ApiQuery extends ApiBase {
 		return implode( "\n", $moduleDescriptions );
 	}
 
+	/**
+	 * Adds any classes that are a subclass of ApiQueryGeneratorBase
+	 * to the allowed generator list
+	 * @param $moduleList array()
+	 */
+	private function makeGeneratorList( $moduleList ) {
+		foreach( $moduleList as  $moduleName => $moduleClass ) {
+			if ( is_subclass_of( $moduleClass, 'ApiQueryGeneratorBase'  ) ) {
+				$this->mAllowedGenerators[] = $moduleName;
+			}
+		}
+	}
+
 	/**
 	 * Override to add extra parameters from PageSet
 	 * @return string
-- 
2.20.1