X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FMergeHistoryPager.php;h=6a8f7da74e480c36c233eaa66fdb7cb549cf8d93;hb=3b87d31562a09951a8983759bfd857ffef8f7b6f;hp=bbf97e13cb64b64a0768523ac45ad29adf98b213;hpb=b9078fdf1e7bd9cdaaa047876e3e9cc416e99653;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php index bbf97e13cb..6a8f7da74e 100644 --- a/includes/specials/pagers/MergeHistoryPager.php +++ b/includes/specials/pagers/MergeHistoryPager.php @@ -85,13 +85,12 @@ class MergeHistoryPager extends ReverseChronologicalPager { $conds['rev_page'] = $this->articleID; $conds[] = "rev_timestamp < " . $this->mDb->addQuotes( $this->maxTimestamp ); + $revQuery = Revision::getQueryInfo( [ 'page', 'user' ] ); return [ - 'tables' => [ 'revision', 'page', 'user' ], - 'fields' => array_merge( Revision::selectFields(), Revision::selectUserFields() ), + 'tables' => $revQuery['tables'], + 'fields' => $revQuery['fields'], 'conds' => $conds, - 'join_conds' => [ - 'page' => Revision::pageJoinCond(), - 'user' => Revision::userJoinCond() ] + 'join_conds' => $revQuery['joins'] ]; }