API: Fix using the same module as generator and prop
authorBrad Jorsch <bjorsch@wikimedia.org>
Tue, 5 Feb 2013 20:08:12 +0000 (15:08 -0500)
committerBrad Jorsch <bjorsch@wikimedia.org>
Tue, 5 Feb 2013 20:08:12 +0000 (15:08 -0500)
Change Ie2dee41e introduced a bug when using the same module as both
generator and prop, e.g.
?action=query&titles=Main_Page&generator=categories&prop=categories

The generator should be an uncached instance of the module.

Change-Id: I80c8b3a715f266a61614c1e1d02aa80b72643ec8

includes/api/ApiQuery.php

index fa1b2d3..35dd695 100644 (file)
@@ -583,7 +583,7 @@ class ApiQuery extends ApiBase {
         * @return ApiQueryGeneratorBase
         */
        public function newGenerator( $generatorName ) {
-               $generator = $this->mModuleMgr->getModule( $generatorName );
+               $generator = $this->mModuleMgr->getModule( $generatorName, null, true );
                if ( $generator === null ) {
                        $this->dieUsage( "Unknown generator=$generatorName", 'badgenerator' );
                }