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 "mediawiki.requestIdleCallback: Re-enable use of native requestIdleCallback"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllPages.php
diff --git
a/includes/api/ApiQueryAllPages.php
b/includes/api/ApiQueryAllPages.php
index
0ce1939
..
7460bd5
100644
(file)
--- a/
includes/api/ApiQueryAllPages.php
+++ b/
includes/api/ApiQueryAllPages.php
@@
-23,6
+23,7
@@
*
* @file
*/
*
* @file
*/
+use MediaWiki\MediaWikiServices;
/**
* Query module to enumerate all available pages.
/**
* Query module to enumerate all available pages.
@@
-49,11
+50,7
@@
class ApiQueryAllPages extends ApiQueryGeneratorBase {
*/
public function executeGenerator( $resultPageSet ) {
if ( $resultPageSet->isResolvingRedirects() ) {
*/
public function executeGenerator( $resultPageSet ) {
if ( $resultPageSet->isResolvingRedirects() ) {
- $this->dieUsage(
- 'Use "gapfilterredir=nonredirects" option instead of "redirects" ' .
- 'when using allpages as a generator',
- 'params'
- );
+ $this->dieWithError( 'apierror-allpages-generator-redirects', 'params' );
}
$this->run( $resultPageSet );
}
$this->run( $resultPageSet );
@@
-156,7
+153,9
@@
class ApiQueryAllPages extends ApiQueryGeneratorBase {
$this->addOption( 'DISTINCT' );
} elseif ( isset( $params['prlevel'] ) ) {
$this->addOption( 'DISTINCT' );
} elseif ( isset( $params['prlevel'] ) ) {
- $this->dieUsage( 'prlevel may not be used without prtype', 'params' );
+ $this->dieWithError(
+ [ 'apierror-invalidparammix-mustusewith', 'prlevel', 'prtype' ], 'invalidparammix'
+ );
}
if ( $params['filterlanglinks'] == 'withoutlanglinks' ) {
}
if ( $params['filterlanglinks'] == 'withoutlanglinks' ) {
@@
-206,7
+205,7
@@
class ApiQueryAllPages extends ApiQueryGeneratorBase {
foreach ( $res as $row ) {
$users[] = $row->page_title;
}
foreach ( $res as $row ) {
$users[] = $row->page_title;
}
-
GenderCache::singleton
()->doQuery( $users, __METHOD__ );
+
MediaWikiServices::getInstance()->getGenderCache
()->doQuery( $users, __METHOD__ );
$res->rewind(); // reset
}
$res->rewind(); // reset
}