X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryDeletedrevs.php;h=5dd007b49aeb3bc597ff1f10edef78ea2ad62c80;hb=72b15b96e7ccf64b129b2cff92211c47f6989ed9;hp=b68a8682c580c67bd037fc96f2ec0b2c02cb877a;hpb=2ffff73a46c29cdad1cbf59063f4dd75debd3b4c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index b68a8682c5..5dd007b49a 100644
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -44,6 +44,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
 		$user = $this->getUser();
 		$db = $this->getDB();
+		$commentStore = new CommentStore( 'ar_comment' );
 		$params = $this->extractRequestParams( false );
 		$prop = array_flip( $params['prop'] );
 		$fld_parentid = isset( $prop['parentid'] );
@@ -115,11 +116,17 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 		$this->addFieldsIf( 'ar_rev_id', $fld_revid );
 		$this->addFieldsIf( 'ar_user_text', $fld_user );
 		$this->addFieldsIf( 'ar_user', $fld_userid );
-		$this->addFieldsIf( 'ar_comment', $fld_comment || $fld_parsedcomment );
 		$this->addFieldsIf( 'ar_minor_edit', $fld_minor );
 		$this->addFieldsIf( 'ar_len', $fld_len );
 		$this->addFieldsIf( 'ar_sha1', $fld_sha1 );
 
+		if ( $fld_comment || $fld_parsedcomment ) {
+			$commentQuery = $commentStore->getJoin();
+			$this->addTables( $commentQuery['tables'] );
+			$this->addFields( $commentQuery['fields'] );
+			$this->addJoinConds( $commentQuery['joins'] );
+		}
+
 		if ( $fld_tags ) {
 			$this->addTables( 'tag_summary' );
 			$this->addJoinConds(
@@ -322,12 +329,13 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 					$anyHidden = true;
 				}
 				if ( Revision::userCanBitfield( $row->ar_deleted, Revision::DELETED_COMMENT, $user ) ) {
+					$comment = $commentStore->getComment( $row )->text;
 					if ( $fld_comment ) {
-						$rev['comment'] = $row->ar_comment;
+						$rev['comment'] = $comment;
 					}
 					if ( $fld_parsedcomment ) {
 						$title = Title::makeTitle( $row->ar_namespace, $row->ar_title );
-						$rev['parsedcomment'] = Linker::formatComment( $row->ar_comment, $title );
+						$rev['parsedcomment'] = Linker::formatComment( $comment, $title );
 					}
 				}
 			}