X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FImagePage.php;h=b1a505758a5bf243d841b8143fabff8930fa8038;hb=38a42ed82346c9e5bca0dc31b5d8256c2d6a63f7;hp=3aeb70afe8fee223f34a1681f693d60ab776eb92;hpb=375ad98780afd2ba3810884fe6d317906d019a39;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 3aeb70afe8..b1a505758a 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -990,7 +990,7 @@ class ImageHistoryList extends ContextSource {
 		$img = $iscur ? $file->getName() : $file->getArchiveName();
 		$userId = $file->getUser( 'id' );
 		$userText = $file->getUser( 'text' );
-		$description = $file->getDescription();
+		$description = $file->getDescription( File::FOR_THIS_USER, $user );
 
 		$local = $this->current->isLocal();
 		$row = $selected = '';
@@ -1038,7 +1038,9 @@ class ImageHistoryList extends ContextSource {
 		$row .= '<td>';
 		if ( $iscur ) {
 			$row .= wfMsgHtml( 'filehist-current' );
-		} elseif ( $local && $user->isLoggedIn() && $this->title->userCan( 'edit' ) ) {
+		} elseif ( $local && $this->title->quickUserCan( 'edit' )
+			&& $this->title->quickUserCan( 'upload' )
+		) {
 			if ( $file->isDeleted( File::DELETED_FILE ) ) {
 				$row .= wfMsgHtml( 'filehist-revert' );
 			} else {
@@ -1099,7 +1101,10 @@ class ImageHistoryList extends ContextSource {
 		// Image dimensions + size
 		$row .= '<td>';
 		$row .= htmlspecialchars( $file->getDimensionsString() );
-		$row .= ' <span style="white-space: nowrap;">(' . Linker::formatSize( $file->getSize() ) . ')</span>';
+		$row .= $this->getContext()->msg( 'word-separator' )->plain();
+		$row .= '<span style="white-space: nowrap;">';
+		$row .= $this->getContext()->msg( 'parentheses' )->rawParams( Linker::formatSize( $file->getSize() ) )->plain();
+		$row .= '</span>';
 		$row .= '</td>';
 
 		// Uploading user