X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Frevisiondelete%2FRevDelLogItem.php;h=36198cd2cf8acdfcddfc870d64d0dbb4bac64e90;hb=91e63a1332fb589f8f3cc47b4466f24943aa8bd4;hp=9e76f4c62c9ed86abd5448e1e447e2361f995916;hpb=41f1ce0d35b929d480ce87605a3234c187e44fd2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php
index 9e76f4c62c..36198cd2cf 100644
--- a/includes/revisiondelete/RevDelLogItem.php
+++ b/includes/revisiondelete/RevDelLogItem.php
@@ -39,6 +39,10 @@ class RevDelLogItem extends RevDelItem {
 		return 'log_user_text';
 	}
 
+	public function getAuthorActorField() {
+		return 'log_actor';
+	}
+
 	public function canView() {
 		return LogEventsList::userCan( $this->row, Revision::DELETED_RESTRICTED, $this->list->getUser() );
 	}
@@ -71,7 +75,7 @@ class RevDelLogItem extends RevDelItem {
 		$dbw->update( 'recentchanges',
 			[
 				'rc_deleted' => $bits,
-				'rc_patrolled' => 1
+				'rc_patrolled' => RecentChange::PRC_PATROLLED
 			],
 			[
 				'rc_logid' => $this->row->log_id,
@@ -102,8 +106,9 @@ class RevDelLogItem extends RevDelItem {
 		// User links and action text
 		$action = $formatter->getActionText();
 		// Comment
+		$comment = CommentStore::getStore()->getComment( 'log_comment', $this->row )->text;
 		$comment = $this->list->getLanguage()->getDirMark()
-			. Linker::commentBlock( $this->row->log_comment );
+			. Linker::commentBlock( $comment );
 
 		if ( LogEventsList::isDeleted( $this->row, LogPage::DELETED_COMMENT ) ) {
 			$comment = '<span class="history-deleted">' . $comment . '</span>';
@@ -119,16 +124,10 @@ class RevDelLogItem extends RevDelItem {
 			'id' => $logEntry->getId(),
 			'type' => $logEntry->getType(),
 			'action' => $logEntry->getSubtype(),
+			'userhidden' => (bool)$logEntry->isDeleted( LogPage::DELETED_USER ),
+			'commenthidden' => (bool)$logEntry->isDeleted( LogPage::DELETED_COMMENT ),
+			'actionhidden' => (bool)$logEntry->isDeleted( LogPage::DELETED_ACTION ),
 		];
-		$ret += $logEntry->isDeleted( LogPage::DELETED_USER )
-			? [ 'userhidden' => '' ]
-			: [];
-		$ret += $logEntry->isDeleted( LogPage::DELETED_COMMENT )
-			? [ 'commenthidden' => '' ]
-			: [];
-		$ret += $logEntry->isDeleted( LogPage::DELETED_ACTION )
-			? [ 'actionhidden' => '' ]
-			: [];
 
 		if ( LogEventsList::userCan( $this->row, LogPage::DELETED_ACTION, $user ) ) {
 			$ret['params'] = LogFormatter::newFromEntry( $logEntry )->formatParametersForApi();
@@ -141,7 +140,8 @@ class RevDelLogItem extends RevDelItem {
 		}
 		if ( LogEventsList::userCan( $this->row, LogPage::DELETED_COMMENT, $user ) ) {
 			$ret += [
-				'comment' => $this->row->log_comment,
+				'comment' => CommentStore::getStore()->getComment( 'log_comment', $this->row )
+					->text,
 			];
 		}