X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpage%2FPageArchive.php;h=af936cc730240ad3c607525f286a810c79ab470a;hb=f2bb88c90ba8e44e141fb9481dc9eef5ad32bd36;hp=188088f6aaf15559716a214b4913f7afbccf517e;hpb=040f2961bcc946b6478ef26c6e495ff1226df0b9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/page/PageArchive.php b/includes/page/PageArchive.php
index 188088f6aa..af936cc730 100644
--- a/includes/page/PageArchive.php
+++ b/includes/page/PageArchive.php
@@ -171,20 +171,21 @@ class PageArchive {
 
 	/**
 	 * List the revisions of the given page. Returns result wrapper with
-	 * (ar_minor_edit, ar_timestamp, ar_user, ar_user_text, ar_comment) fields.
+	 * various archive table fields.
 	 *
 	 * @return ResultWrapper
 	 */
 	public function listRevisions() {
 		$dbr = wfGetDB( DB_REPLICA );
+		$commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
 
-		$tables = [ 'archive' ];
+		$tables = [ 'archive' ] + $commentQuery['tables'];
 
 		$fields = [
 			'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text',
-			'ar_comment', 'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1',
+			'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1',
 			'ar_page_id'
-		];
+		] + $commentQuery['fields'];
 
 		if ( $this->config->get( 'ContentHandlerUseDB' ) ) {
 			$fields[] = 'ar_content_format';
@@ -196,7 +197,7 @@ class PageArchive {
 
 		$options = [ 'ORDER BY' => 'ar_timestamp DESC' ];
 
-		$join_conds = [];
+		$join_conds = [] + $commentQuery['joins'];
 
 		ChangeTags::modifyDisplayQuery(
 			$tables,
@@ -248,11 +249,13 @@ class PageArchive {
 	 */
 	public function getRevision( $timestamp ) {
 		$dbr = wfGetDB( DB_REPLICA );
+		$commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
+
+		$tables = [ 'archive' ] + $commentQuery['tables'];
 
 		$fields = [
 			'ar_rev_id',
 			'ar_text',
-			'ar_comment',
 			'ar_user',
 			'ar_user_text',
 			'ar_timestamp',
@@ -262,19 +265,27 @@ class PageArchive {
 			'ar_deleted',
 			'ar_len',
 			'ar_sha1',
-		];
+		] + $commentQuery['fields'];
 
 		if ( $this->config->get( 'ContentHandlerUseDB' ) ) {
 			$fields[] = 'ar_content_format';
 			$fields[] = 'ar_content_model';
 		}
 
-		$row = $dbr->selectRow( 'archive',
+		$join_conds = [] + $commentQuery['joins'];
+
+		$row = $dbr->selectRow(
+			$tables,
 			$fields,
-			[ 'ar_namespace' => $this->title->getNamespace(),
+			[
+				'ar_namespace' => $this->title->getNamespace(),
 				'ar_title' => $this->title->getDBkey(),
-				'ar_timestamp' => $dbr->timestamp( $timestamp ) ],
-			__METHOD__ );
+				'ar_timestamp' => $dbr->timestamp( $timestamp )
+			],
+			__METHOD__,
+			[],
+			$join_conds
+		);
 
 		if ( $row ) {
 			return Revision::newFromArchiveRow( $row, [ 'title' => $this->title ] );
@@ -453,25 +464,12 @@ class PageArchive {
 
 		// Touch the log!
 
-		if ( $textRestored && $filesRestored ) {
-			$reason = wfMessage( 'undeletedrevisions-files' )
-				->numParams( $textRestored, $filesRestored )->inContentLanguage()->text();
-		} elseif ( $textRestored ) {
-			$reason = wfMessage( 'undeletedrevisions' )->numParams( $textRestored )
-				->inContentLanguage()->text();
-		} elseif ( $filesRestored ) {
-			$reason = wfMessage( 'undeletedfiles' )->numParams( $filesRestored )
-				->inContentLanguage()->text();
-		} else {
+		if ( !$textRestored && !$filesRestored ) {
 			wfDebug( "Undelete: nothing undeleted...\n" );
 
 			return false;
 		}
 
-		if ( trim( $comment ) != '' ) {
-			$reason .= wfMessage( 'colon-separator' )->inContentLanguage()->text() . $comment;
-		}
-
 		if ( $user === null ) {
 			global $wgUser;
 			$user = $wgUser;
@@ -480,15 +478,21 @@ class PageArchive {
 		$logEntry = new ManualLogEntry( 'delete', 'restore' );
 		$logEntry->setPerformer( $user );
 		$logEntry->setTarget( $this->title );
-		$logEntry->setComment( $reason );
+		$logEntry->setComment( $comment );
 		$logEntry->setTags( $tags );
+		$logEntry->setParameters( [
+			':assoc:count' => [
+				'revisions' => $textRestored,
+				'files' => $filesRestored,
+			],
+		] );
 
 		Hooks::run( 'ArticleUndeleteLogEntry', [ $this, &$logEntry, $user ] );
 
 		$logid = $logEntry->insert();
 		$logEntry->publish( $logid );
 
-		return [ $textRestored, $filesRestored, $reason ];
+		return [ $textRestored, $filesRestored, $comment ];
 	}
 
 	/**
@@ -559,12 +563,15 @@ class PageArchive {
 			$oldWhere['ar_timestamp'] = array_map( [ &$dbw, 'timestamp' ], $timestamps );
 		}
 
+		$commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
+
+		$tables = [ 'archive', 'revision' ] + $commentQuery['tables'];
+
 		$fields = [
 			'ar_id',
 			'ar_rev_id',
 			'rev_id',
 			'ar_text',
-			'ar_comment',
 			'ar_user',
 			'ar_user_text',
 			'ar_timestamp',
@@ -575,24 +582,28 @@ class PageArchive {
 			'ar_page_id',
 			'ar_len',
 			'ar_sha1'
-		];
+		] + $commentQuery['fields'];
 
 		if ( $this->config->get( 'ContentHandlerUseDB' ) ) {
 			$fields[] = 'ar_content_format';
 			$fields[] = 'ar_content_model';
 		}
 
+		$join_conds = [
+			'revision' => [ 'LEFT JOIN', 'ar_rev_id=rev_id' ],
+		] + $commentQuery['joins'];
+
 		/**
 		 * Select each archived revision...
 		 */
 		$result = $dbw->select(
-			[ 'archive', 'revision' ],
+			$tables,
 			$fields,
 			$oldWhere,
 			__METHOD__,
 			/* options */
 			[ 'ORDER BY' => 'ar_timestamp' ],
-			[ 'revision' => [ 'LEFT JOIN', 'ar_rev_id=rev_id' ] ]
+			$join_conds
 		);
 
 		$rev_count = $result->numRows();
@@ -723,7 +734,9 @@ class PageArchive {
 						'deleted' => $unsuppress ? 0 : $row->ar_deleted
 					] );
 
+				// This will also copy the revision to ip_changes if it was an IP edit.
 				$revision->insertOn( $dbw );
+
 				$restored++;
 
 				Hooks::run( 'ArticleRevisionUndeleted',