Don't show orphaned revisions (will matter for bug 11402 later)

diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 31a8d1e..67b261e 100644 (file)
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -457,9 +457,9 @@ class ApiPageSet extends ApiQueryBase {
                $pageids = array();
                $remaining = array_flip($revids);
 
-               $tables = array('revision');
+               $tables = array('revision','page');
                $fields = array('rev_id','rev_page');
-               $where = array('rev_deleted' => 0, 'rev_id' => $revids);
+               $where = array('rev_deleted' => 0, 'rev_id' => $revids,'rev_page = page_id');
 
                // Get pageIDs data from the `page` table
                $this->profileDBIn();

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 9a0166c..db3b9e9 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -100,6 +100,8 @@ class ApiQueryRevisions extends ApiQueryBase {
 
                $this->addTables('revision');
                $this->addFields( Revision::selectFields() );
+               $this->addTables( 'page' );
+               $this->addWhere('page_id = rev_page');
 
                $prop = array_flip($prop);
 
@@ -114,8 +116,6 @@ class ApiQueryRevisions extends ApiQueryBase {
                $this->token = $token;
 
                if ( !is_null($this->token) || ( $this->fld_content && $this->expandTemplates ) || $pageCount > 0) {
-                       $this->addTables( 'page' );
-                       $this->addWhere('page_id=rev_page');
                        $this->addFields( Revision::selectPageFields() );
                }