diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2014-12-27 15:41:37 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2014-12-31 11:43:28 +0100 |
commit | c1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch) | |
tree | 2b38796e738dd74cb42ecd9bfd151803108386bc /includes/api/ApiQueryQueryPage.php | |
parent | b88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff) |
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/api/ApiQueryQueryPage.php')
-rw-r--r-- | includes/api/ApiQueryQueryPage.php | 65 |
1 files changed, 12 insertions, 53 deletions
diff --git a/includes/api/ApiQueryQueryPage.php b/includes/api/ApiQueryQueryPage.php index 79fe0498..5ddd9450 100644 --- a/includes/api/ApiQueryQueryPage.php +++ b/includes/api/ApiQueryQueryPage.php @@ -32,18 +32,13 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { private $qpMap; - public function __construct( $query, $moduleName ) { + public function __construct( ApiQuery $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; + $uselessQueryPages = $this->getConfig()->get( 'APIUselessQueryPages' ); $this->qpMap = array(); - foreach ( $wgQueryPages as $page ) { - if ( !in_array( $page[1], $wgAPIUselessQueryPages ) ) { + foreach ( QueryPage::getPages() as $page ) { + if ( !in_array( $page[1], $uselessQueryPages ) ) { $this->qpMap[$page[1]] = $page[0]; } } @@ -58,11 +53,9 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { } /** - * @param $resultPageSet ApiPageSet + * @param ApiPageSet $resultPageSet */ public function run( $resultPageSet = null ) { - global $wgQueryCacheLimit; - $params = $this->extractRequestParams(); $result = $this->getResult(); @@ -82,7 +75,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { if ( $ts ) { $r['cachedtimestamp'] = wfTimestamp( TS_ISO_8601, $ts ); } - $r['maxresults'] = $wgQueryCacheLimit; + $r['maxresults'] = $this->getConfig()->get( 'QueryCacheLimit' ); } } $result->addValue( array( 'query' ), $this->getModuleName(), $r ); @@ -126,7 +119,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 +134,7 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { if ( $qp->getRestriction() != '' ) { return 'private'; } + return 'public'; } @@ -166,46 +163,8 @@ class ApiQueryQueryPage extends ApiQueryGeneratorBase { ); } - public function getResultProperties() { - return array( - ApiBase::PROP_ROOT => array( - 'name' => array( - ApiBase::PROP_TYPE => 'string', - ApiBase::PROP_NULLABLE => false - ), - 'disabled' => array( - ApiBase::PROP_TYPE => 'boolean', - ApiBase::PROP_NULLABLE => false - ), - 'cached' => array( - ApiBase::PROP_TYPE => 'boolean', - ApiBase::PROP_NULLABLE => false - ), - 'cachedtimestamp' => array( - ApiBase::PROP_TYPE => 'timestamp', - ApiBase::PROP_NULLABLE => true - ) - ), - '' => array( - 'value' => 'string', - 'timestamp' => array( - ApiBase::PROP_TYPE => 'timestamp', - ApiBase::PROP_NULLABLE => true - ), - 'ns' => 'namespace', - 'title' => 'string' - ) - ); - } - public function getDescription() { - return 'Get a list provided by a QueryPage-based special page'; - } - - public function getPossibleErrors() { - return array_merge( parent::getPossibleErrors(), array( - array( 'specialpage-cantexecute' ) - ) ); + return 'Get a list provided by a QueryPage-based special page.'; } public function getExamples() { |