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 "resourceloader: Speed up dependency checks in structure/ResourcesTest"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllRevisions.php
diff --git
a/includes/api/ApiQueryAllRevisions.php
b/includes/api/ApiQueryAllRevisions.php
index
922d2c3
..
050bc0f
100644
(file)
--- a/
includes/api/ApiQueryAllRevisions.php
+++ b/
includes/api/ApiQueryAllRevisions.php
@@
-44,7
+44,8
@@
class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
$db = $this->getDB();
$params = $this->extractRequestParams( false );
$db = $this->getDB();
$params = $this->extractRequestParams( false );
- $revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
+ $services = MediaWikiServices::getInstance();
+ $revisionStore = $services->getRevisionStore();
$result = $this->getResult();
$result = $this->getResult();
@@
-70,7
+71,7
@@
class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
if ( $params['namespace'] !== null ) {
$params['namespace'] = array_unique( $params['namespace'] );
sort( $params['namespace'] );
if ( $params['namespace'] !== null ) {
$params['namespace'] = array_unique( $params['namespace'] );
sort( $params['namespace'] );
- if ( $params['namespace'] !=
MWNamespace::
getValidNamespaces() ) {
+ if ( $params['namespace'] !=
$services->getNamespaceInfo()->
getValidNamespaces() ) {
$needPageTable = true;
if ( $this->getConfig()->get( 'MiserMode' ) ) {
$miser_ns = $params['namespace'];
$needPageTable = true;
if ( $this->getConfig()->get( 'MiserMode' ) ) {
$miser_ns = $params['namespace'];
@@
-82,9
+83,7
@@
class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
if ( $resultPageSet === null ) {
$this->parseParameters( $params );
if ( $resultPageSet === null ) {
$this->parseParameters( $params );
- $revQuery = $revisionStore->getQueryInfo(
- $this->fetchContent ? [ 'page', 'text' ] : [ 'page' ]
- );
+ $revQuery = $revisionStore->getQueryInfo( [ 'page' ] );
} else {
$this->limit = $this->getParameter( 'limit' ) ?: 10;
$revQuery = [
} else {
$this->limit = $this->getParameter( 'limit' ) ?: 10;
$revQuery = [
@@
-105,7
+104,7
@@
class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
if ( $needPageTable ) {
$revQuery['tables'][] = 'page';
if ( $needPageTable ) {
$revQuery['tables'][] = 'page';
- $revQuery['joins']['page'] = [ '
INNER
JOIN', [ "$pageField = page_id" ] ];
+ $revQuery['joins']['page'] = [ 'JOIN', [ "$pageField = page_id" ] ];
if ( (bool)$miser_ns ) {
$revQuery['fields'][] = 'page_namespace';
}
if ( (bool)$miser_ns ) {
$revQuery['fields'][] = 'page_namespace';
}
@@
-140,11
+139,7
@@
class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
$this->addTimestampWhereRange( $tsField, $dir, $params['start'], $params['end'] );
if ( $this->fld_tags ) {
$this->addTimestampWhereRange( $tsField, $dir, $params['start'], $params['end'] );
if ( $this->fld_tags ) {
- $this->addTables( 'tag_summary' );
- $this->addJoinConds(
- [ 'tag_summary' => [ 'LEFT JOIN', [ 'rev_id=ts_rev_id' ] ] ]
- );
- $this->addFields( 'ts_tags' );
+ $this->addFields( [ 'ts_tags' => ChangeTags::makeTagSummarySubquery( 'revision' ) ] );
}
if ( $params['user'] !== null ) {
}
if ( $params['user'] !== null ) {