* Re-applying r34449, r34500 and r34518 which Brion reverted by accident

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

diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index 21ceb27..1ada118 100644 (file)
--- a/includes/api/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -59,7 +59,6 @@ class ApiQueryContributions extends ApiQueryBase {
                $this->selectNamedDB('contributions', DB_SLAVE, 'contributions');
                $db = $this->getDB();
 
-
                if(isset($this->params['userprefix']))
                {
                        $this->prefixMode = true;
@@ -131,8 +130,8 @@ class ApiQueryContributions extends ApiQueryBase {
 
                //We're after the revision table, and the corresponding page row for
                //anything we retrieve.
-               list ($tbl_page, $tbl_revision) = $this->getDB()->tableNamesN('page', 'revision');
-               $this->addTables("$tbl_revision LEFT OUTER JOIN $tbl_page ON page_id=rev_page");
+               $this->addTables(array('revision', 'page'));
+               $this->addWhere('page_id=rev_page');
 
                $this->addWhereFld('rev_deleted', 0);
                // We only want pages by the specified users.