X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryQueryPage.php;h=b13f79720933886f6c0499e5977dc6ac8f4527eb;hb=648ed2f069a3ac9229f5085ae3b26aa7c141d2ab;hp=79fe0498cfac167a1188eceb62b993370b0a130a;hpb=654f713af6c58d57b35364f4b10d45b2ba0384ad;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php
index 79fe0498cf..b13f797209 100644
--- a/includes/api/ApiQueryQueryPage.php
+++ b/includes/api/ApiQueryQueryPage.php
@@ -34,15 +34,10 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase {
 
 	public function __construct( $query, $moduleName ) {
 		parent::__construct( $query, $moduleName, 'qp' );
-		// We need to do this to make sure $wgQueryPages is set up
-		// This SUCKS
-		global $IP;
-		require_once "$IP/includes/QueryPage.php";
-
 		// Build mapping from special page names to QueryPage classes
-		global $wgQueryPages, $wgAPIUselessQueryPages;
+		global $wgAPIUselessQueryPages;
 		$this->qpMap = array();
-		foreach ( $wgQueryPages as $page ) {
+		foreach ( QueryPage::getPages() as $page ) {
 			if ( !in_array( $page[1], $wgAPIUselessQueryPages ) ) {
 				$this->qpMap[$page[1]] = $page[0];
 			}
@@ -126,7 +121,10 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase {
 			}
 		}
 		if ( is_null( $resultPageSet ) ) {
-			$result->setIndexedTagName_internal( array( 'query', $this->getModuleName(), 'results' ), 'page' );
+			$result->setIndexedTagName_internal(
+				array( 'query', $this->getModuleName(), 'results' ),
+				'page'
+			);
 		} else {
 			$resultPageSet->populateFromTitles( $titles );
 		}
@@ -138,6 +136,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase {
 		if ( $qp->getRestriction() != '' ) {
 			return 'private';
 		}
+
 		return 'public';
 	}
 
@@ -199,7 +198,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase {
 	}
 
 	public function getDescription() {
-		return 'Get a list provided by a QueryPage-based special page';
+		return 'Get a list provided by a QueryPage-based special page.';
 	}
 
 	public function getPossibleErrors() {