X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Frevisiondelete%2FRevDelRevisionList.php;h=07362c422ff1e82ef5a2acff8702bc92afb94881;hb=f866dd9db945f0433aa4dcb25502e73d628ea2ef;hp=453c6cca70f428dffb2b6792e76a5f8ccc145999;hpb=f7668403e0218e05dadfd7e0efed63bcb7953b7a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/revisiondelete/RevDelRevisionList.php b/includes/revisiondelete/RevDelRevisionList.php
index 453c6cca70..07362c422f 100644
--- a/includes/revisiondelete/RevDelRevisionList.php
+++ b/includes/revisiondelete/RevDelRevisionList.php
@@ -20,6 +20,7 @@
  */
 
 use Wikimedia\Rdbms\FakeResultWrapper;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * List for revision table items
@@ -61,9 +62,10 @@ class RevDelRevisionList extends RevDelList {
 	 */
 	public function doQuery( $db ) {
 		$ids = array_map( 'intval', $this->ids );
+		$revQuery = Revision::getQueryInfo( [ 'page', 'user' ] );
 		$queryInfo = [
-			'tables' => [ 'revision', 'page', 'user' ],
-			'fields' => array_merge( Revision::selectFields(), Revision::selectUserFields() ),
+			'tables' => $revQuery['tables'],
+			'fields' => $revQuery['fields'],
 			'conds' => [
 				'rev_page' => $this->title->getArticleID(),
 				'rev_id' => $ids,
@@ -72,10 +74,7 @@ class RevDelRevisionList extends RevDelList {
 				'ORDER BY' => 'rev_id DESC',
 				'USE INDEX' => [ 'revision' => 'PRIMARY' ] // workaround for MySQL bug (T104313)
 			],
-			'join_conds' => [
-				'page' => Revision::pageJoinCond(),
-				'user' => Revision::userJoinCond(),
-			],
+			'join_conds' => $revQuery['joins'],
 		];
 		ChangeTags::modifyDisplayQuery(
 			$queryInfo['tables'],
@@ -99,14 +98,15 @@ class RevDelRevisionList extends RevDelList {
 			return $live;
 		}
 
+		$arQuery = Revision::getArchiveQueryInfo();
 		$archiveQueryInfo = [
-			'tables' => [ 'archive' ],
-			'fields' => Revision::selectArchiveFields(),
+			'tables' => $arQuery['tables'],
+			'fields' => $arQuery['fields'],
 			'conds' => [
 				'ar_rev_id' => $ids,
 			],
 			'options' => [ 'ORDER BY' => 'ar_rev_id DESC' ],
-			'join_conds' => [],
+			'join_conds' => $arQuery['joins'],
 		];
 
 		ChangeTags::modifyDisplayQuery(