Avoid calling protected File field
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 11 Dec 2013 19:16:41 +0000 (11:16 -0800)
committerAaron Schulz <aschulz@wikimedia.org>
Thu, 12 Dec 2013 18:25:12 +0000 (10:25 -0800)
bug: 58333
Change-Id: I0bd4a5fe9687c4261ca0f57e30f723e8bf2589ac

includes/revisiondelete/RevisionDelete.php

index 7185087..0c887e4 100644 (file)
@@ -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();
                }