From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 11 Dec 2013 19:16:41 +0000 (-0800)
Subject: Avoid calling protected File field
X-Git-Tag: 1.31.0-rc.0~17658^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=8bd386e3680808d1ae1166140ef6917f0498ef3a;p=lhc%2Fweb%2Fwiklou.git

Avoid calling protected File field

bug: 58333
Change-Id: I0bd4a5fe9687c4261ca0f57e30f723e8bf2589ac
---

diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index 718508777b..0c887e4385 100644
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -669,8 +669,9 @@ class RevDel_FileItem extends RevDel_Item {
 	 */
 	protected function getUserTools() {
 		if ( $this->file->userCan( Revision::DELETED_USER, $this->list->getUser() ) ) {
-			$link = Linker::userLink( $this->file->user, $this->file->user_text ) .
-				Linker::userToolLinks( $this->file->user, $this->file->user_text );
+			$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();
 		}
@@ -688,7 +689,7 @@ class RevDel_FileItem extends RevDel_Item {
 	 */
 	protected function getComment() {
 		if ( $this->file->userCan( File::DELETED_COMMENT, $this->list->getUser() ) ) {
-			$block = Linker::commentBlock( $this->file->description );
+			$block = Linker::commentBlock( $this->file->getDescription() );
 		} else {
 			$block = ' ' . $this->list->msg( 'rev-deleted-comment' )->escaped();
 		}