dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "IEFixes: Clean up duplicate variables"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryQueryPage.php
diff --git
a/includes/api/ApiQueryQueryPage.php
b/includes/api/ApiQueryQueryPage.php
index
79fe049
..
b13f797
100644
(file)
--- 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' );
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
// Build mapping from special page names to QueryPage classes
- global $wg
QueryPages, $wg
APIUselessQueryPages;
+ global $wgAPIUselessQueryPages;
$this->qpMap = array();
$this->qpMap = array();
- foreach (
$wgQueryPages
as $page ) {
+ foreach (
QueryPage::getPages()
as $page ) {
if ( !in_array( $page[1], $wgAPIUselessQueryPages ) ) {
$this->qpMap[$page[1]] = $page[0];
}
if ( !in_array( $page[1], $wgAPIUselessQueryPages ) ) {
$this->qpMap[$page[1]] = $page[0];
}
@@
-126,7
+121,10
@@
class ApiQueryQueryPage extends ApiQueryGeneratorBase {
}
}
if ( is_null( $resultPageSet ) ) {
}
}
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 );
}
} else {
$resultPageSet->populateFromTitles( $titles );
}
@@
-138,6
+136,7
@@
class ApiQueryQueryPage extends ApiQueryGeneratorBase {
if ( $qp->getRestriction() != '' ) {
return 'private';
}
if ( $qp->getRestriction() != '' ) {
return 'private';
}
+
return 'public';
}
return 'public';
}
@@
-199,7
+198,7
@@
class ApiQueryQueryPage extends ApiQueryGeneratorBase {
}
public function getDescription() {
}
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() {
}
public function getPossibleErrors() {