X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2Frevisiondelete%2FRevDelFileItem.php;h=8c080baf83b866abcc6c88ebe5a44e31a83b20c9;hb=835a1c38f00b601fbcc81a2aad8639160ccb1bc1;hp=9beafc9893b4cbd385e404c1e2e4ce6e2d761ea7;hpb=325e34477409440b28bbcee04e0447b91b45262b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/revisiondelete/RevDelFileItem.php b/includes/revisiondelete/RevDelFileItem.php
index 9beafc9893..8c080baf83 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -19,6 +19,8 @@
  * @ingroup RevisionDelete
  */
 
+use MediaWiki\Storage\RevisionRecord;
+
 /**
  * Item class for an oldimage table row
  */
@@ -30,7 +32,18 @@ class RevDelFileItem extends RevDelItem {
 
 	public function __construct( $list, $row ) {
 		parent::__construct( $list, $row );
-		$this->file = RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row );
+		$this->file = static::initFile( $list, $row );
+	}
+
+	/**
+	 * Create file object from $row sourced from $list
+	 *
+	 * @param RevDelFileList $list
+	 * @param mixed $row
+	 * @return mixed
+	 */
+	protected static function initFile( $list, $row ) {
+		return RepoGroup::singleton()->getLocalRepo()->newFileFromRow( $row );
 	}
 
 	public function getIdField() {
@@ -49,6 +62,10 @@ class RevDelFileItem extends RevDelItem {
 		return 'oi_user_text';
 	}
 
+	public function getAuthorActorField() {
+		return 'oi_actor';
+	}
+
 	public function getId() {
 		$parts = explode( '!', $this->row->oi_archive_name );
 
@@ -149,14 +166,14 @@ class RevDelFileItem extends RevDelItem {
 	 * @return string HTML
 	 */
 	protected function getUserTools() {
-		if ( $this->file->userCan( Revision::DELETED_USER, $this->list->getUser() ) ) {
+		if ( $this->file->userCan( RevisionRecord::DELETED_USER, $this->list->getUser() ) ) {
 			$uid = $this->file->getUser( 'id' );
 			$name = $this->file->getUser( 'text' );
 			$link = Linker::userLink( $uid, $name ) . Linker::userToolLinks( $uid, $name );
 		} else {
 			$link = $this->list->msg( 'rev-deleted-user' )->escaped();
 		}
-		if ( $this->file->isDeleted( Revision::DELETED_USER ) ) {
+		if ( $this->file->isDeleted( RevisionRecord::DELETED_USER ) ) {
 			return '<span class="history-deleted">' . $link . '</span>';
 		}
 
@@ -202,8 +219,8 @@ class RevDelFileItem extends RevDelItem {
 			'width' => $file->getWidth(),
 			'height' => $file->getHeight(),
 			'size' => $file->getSize(),
-			'userhidden' => (bool)$file->isDeleted( Revision::DELETED_USER ),
-			'commenthidden' => (bool)$file->isDeleted( Revision::DELETED_COMMENT ),
+			'userhidden' => (bool)$file->isDeleted( RevisionRecord::DELETED_USER ),
+			'commenthidden' => (bool)$file->isDeleted( RevisionRecord::DELETED_COMMENT ),
 			'contenthidden' => (bool)$this->isDeleted(),
 		];
 		if ( !$this->isDeleted() ) {
@@ -221,13 +238,13 @@ class RevDelFileItem extends RevDelItem {
 				),
 			];
 		}
-		if ( $file->userCan( Revision::DELETED_USER, $user ) ) {
+		if ( $file->userCan( RevisionRecord::DELETED_USER, $user ) ) {
 			$ret += [
 				'userid' => $file->user,
 				'user' => $file->user_text,
 			];
 		}
-		if ( $file->userCan( Revision::DELETED_COMMENT, $user ) ) {
+		if ( $file->userCan( RevisionRecord::DELETED_COMMENT, $user ) ) {
 			$ret += [
 				'comment' => $file->description,
 			];