* (bug 24166) API error when using rvprop=tags

Move addition of revision table to after other joins

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b3f45dc..cbe2d84 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -376,6 +376,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * For required string parameters, if '' is provided, this is now classed as
   missing
 * (bug 24724) list=allusers is out by 1 (shows total users - 1)
+* (bug 24166) API error when using rvprop=tags
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 610dd0b..3f97a33 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -136,7 +136,7 @@ class ApiQueryRevisions extends ApiQueryBase {
                }
 
                $db = $this->getDB();
-               $this->addTables( array( 'page', 'revision' ) );
+               $this->addTables( 'page' );
                $this->addFields( Revision::selectFields() );
                $this->addWhere( 'page_id = rev_page' );
 
@@ -202,6 +202,9 @@ class ApiQueryRevisions extends ApiQueryBase {
                        }
                }
 
+               //Bug 24166 - API error when using rvprop=tags
+               $this->addTables( 'revision' );
+
                $userMax = ( $this->fld_content ? ApiBase::LIMIT_SML1 : ApiBase::LIMIT_BIG1 );
                $botMax  = ( $this->fld_content ? ApiBase::LIMIT_SML2 : ApiBase::LIMIT_BIG2 );
                $limit = $params['limit'];