Merge "Rewrite pref cleanup script"

[lhc/web/wiklou.git] / includes / api / ApiQueryRevisions.php

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index a4f0315..ef0223a 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- *
- * Created on Sep 7, 2006
- *
  * Copyright © 2006 Yuri Astrakhan "<Firstname><Lastname>@gmail.com"
  *
  * This program is free software; you can redistribute it and/or modify
@@ -60,7 +56,7 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase {
                }
 
                $this->tokenFunctions = [
-                       'rollback' => [ 'ApiQueryRevisions', 'getRollbackToken' ]
+                       'rollback' => [ self::class, 'getRollbackToken' ]
                ];
                Hooks::run( 'APIQueryRevisionsTokens', [ &$this->tokenFunctions ] );
 
@@ -129,20 +125,31 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase {
                }
 
                $db = $this->getDB();
-               $this->addTables( [ 'revision', 'page' ] );
-               $this->addJoinConds(
-                       [ 'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ] ]
-               );
 
                if ( $resultPageSet === null ) {
                        $this->parseParameters( $params );
                        $this->token = $params['token'];
-                       $this->addFields( Revision::selectFields() );
+                       $opts = [];
                        if ( $this->token !== null || $pageCount > 0 ) {
-                               $this->addFields( Revision::selectPageFields() );
+                               $opts[] = 'page';
                        }
+                       if ( $this->fetchContent ) {
+                               $opts[] = 'text';
+                       }
+                       if ( $this->fld_user ) {
+                               $opts[] = 'user';
+                       }
+                       $revQuery = Revision::getQueryInfo( $opts );
+                       $this->addTables( $revQuery['tables'] );
+                       $this->addFields( $revQuery['fields'] );
+                       $this->addJoinConds( $revQuery['joins'] );
                } else {
                        $this->limit = $this->getParameter( 'limit' ) ?: 10;
+                       // Always join 'page' so orphaned revisions are filtered out
+                       $this->addTables( [ 'revision', 'page' ] );
+                       $this->addJoinConds(
+                               [ 'page' => [ 'INNER JOIN', [ 'page_id = rev_page' ] ] ]
+                       );
                        $this->addFields( [ 'rev_id', 'rev_timestamp', 'rev_page' ] );
                }
 
@@ -162,11 +169,11 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase {
                        $this->addWhereFld( 'ct_tag', $params['tag'] );
                }
 
-               if ( $this->fetchContent ) {
+               if ( $resultPageSet === null && $this->fetchContent ) {
                        // For each page we will request, the user must have read rights for that page
                        $user = $this->getUser();
                        $status = Status::newGood();
-                       /** @var $title Title */
+                       /** @var Title $title */
                        foreach ( $pageSet->getGoodTitles() as $title ) {
                                if ( !$title->userCan( 'read', $user ) ) {
                                        $status->fatal( ApiMessage::create(
@@ -178,20 +185,6 @@ class ApiQueryRevisions extends ApiQueryRevisionsBase {
                        if ( !$status->isGood() ) {
                                $this->dieStatus( $status );
                        }
-
-                       $this->addTables( 'text' );
-                       $this->addJoinConds(
-                               [ 'text' => [ 'INNER JOIN', [ 'rev_text_id=old_id' ] ] ]
-                       );
-                       $this->addFields( 'old_id' );
-                       $this->addFields( Revision::selectTextFields() );
-               }
-
-               // add user name, if needed
-               if ( $this->fld_user ) {
-                       $this->addTables( 'user' );
-                       $this->addJoinConds( [ 'user' => Revision::userJoinCond() ] );
-                       $this->addFields( Revision::selectUserFields() );
                }
 
                if ( $enumRevMode ) {