Added ORMIterator interface which can be used for type hinting (in particular when...

[lhc/web/wiklou.git] / includes / ImagePage.php

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 63e9894..8f683e9 100644 (file)
--- 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 = '';
@@ -1114,8 +1114,11 @@ class ImageHistoryList extends ContextSource {
                        $row .= '<span class="history-deleted">' . wfMsgHtml( 'rev-deleted-user' ) . '</span>';
                } else {
                        if ( $local ) {
-                               $row .= Linker::userLink( $userId, $userText ) . ' <span style="white-space: nowrap;">' .
-                               Linker::userToolLinks( $userId, $userText ) . '</span>';
+                               $row .= Linker::userLink( $userId, $userText );
+                               $row .= $this->getContext()->msg( 'word-separator' )->plain();
+                               $row .= '<span style="white-space: nowrap;">';
+                               $row .= Linker::userToolLinks( $userId, $userText );
+                               $row .= '</span>';
                        } else {
                                $row .= htmlspecialchars( $userText );
                        }