| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -183,8 +183,10 @@ |
| 184 | 184 | * (bug 7304) Links on redirect pages no longer cause the redirect page to show |
| 185 | 185 | up as a redirect to the linked page on Special:Whatlinkshere. |
| 186 | 186 | * (bug 32609) API: Move captchaid/captchaword of action=edit from core |
| 187 | | - to Captcha extension(s) |
| | 187 | + to Captcha extension(s). |
| 188 | 188 | * Added 'ApiGetDescription' hook. |
| | 189 | +* (bug 32688) Paraminfo for parameter "generator" of the query module shows too |
| | 190 | + many types |
| 189 | 191 | |
| 190 | 192 | === Languages updated in 1.19 === |
| 191 | 193 | |
| Index: trunk/phase3/includes/api/ApiQuery.php |
| — | — | @@ -101,6 +101,8 @@ |
| 102 | 102 | private $mSlaveDB = null; |
| 103 | 103 | private $mNamedDB = array(); |
| 104 | 104 | |
| | 105 | + protected $mAllowedGenerators = array(); |
| | 106 | + |
| 105 | 107 | public function __construct( $main, $action ) { |
| 106 | 108 | parent::__construct( $main, $action ); |
| 107 | 109 | |
| — | — | @@ -114,9 +116,8 @@ |
| 115 | 117 | $this->mListModuleNames = array_keys( $this->mQueryListModules ); |
| 116 | 118 | $this->mMetaModuleNames = array_keys( $this->mQueryMetaModules ); |
| 117 | 119 | |
| 118 | | - // Allow the entire list of modules at first, |
| 119 | | - // but during module instantiation check if it can be used as a generator. |
| 120 | | - $this->mAllowedGenerators = array_merge( $this->mListModuleNames, $this->mPropModuleNames ); |
| | 120 | + $this->makeHelpMsgHelper( $this->mQueryPropModules, 'prop' ); |
| | 121 | + $this->makeHelpMsgHelper( $this->mQueryListModules, 'list' ); |
| 121 | 122 | } |
| 122 | 123 | |
| 123 | 124 | /** |
| — | — | @@ -631,6 +632,9 @@ |
| 632 | 633 | $moduleDescriptions = array(); |
| 633 | 634 | |
| 634 | 635 | foreach ( $moduleList as $moduleName => $moduleClass ) { |
| | 636 | + /** |
| | 637 | + * @var $module ApiQueryBase |
| | 638 | + */ |
| 635 | 639 | $module = new $moduleClass( $this, $moduleName, null ); |
| 636 | 640 | |
| 637 | 641 | $msg = ApiMain::makeHelpMsgHeader( $module, $paramName ); |