From 222b01f5169f1c7e69762e0e8904c24f78f71882 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 28 Jul 2010 11:52:48 +0200 Subject: update to MediaWiki 1.16.0 --- includes/ImagePage.php | 361 +++++++++++++++++++++++++++++++------------------ 1 file changed, 233 insertions(+), 128 deletions(-) (limited to 'includes/ImagePage.php') diff --git a/includes/ImagePage.php b/includes/ImagePage.php index 4f3b859a..dd2c2ab1 100644 --- a/includes/ImagePage.php +++ b/includes/ImagePage.php @@ -84,6 +84,8 @@ class ImagePage extends Article { if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) ) return Article::view(); + + $this->showRedirectedFromHeader(); if( $wgShowEXIF && $this->displayImg->exists() ) { // FIXME: bad interface, see note on MediaHandler::formatMetadata(). @@ -115,7 +117,7 @@ class ImagePage extends Article { if( $fol != '-' && !wfEmptyMsg( 'shareddescriptionfollows', $fol ) ) { $wgOut->addWikiText( $fol ); } - $wgOut->addHTML( '
' . $this->mExtraDescription . '
' ); + $wgOut->addHTML( '
' . $this->mExtraDescription . "
\n" ); } $this->closeShowImage(); @@ -130,12 +132,18 @@ class ImagePage extends Article { # Yet we return metadata about the target. Definitely an issue in the FileRepo $this->imageRedirects(); $this->imageLinks(); + + # Allow extensions to add something after the image links + $html = ''; + wfRunHooks( 'ImagePageAfterImageLinks', array( $this, &$html ) ); + if ( $html) + $wgOut->addHTML( $html ); if( $showmeta ) { global $wgStylePath, $wgStyleVersion; $expand = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-expand' ) ) ); $collapse = htmlspecialchars( Xml::escapeJsString( wfMsg( 'metadata-collapse' ) ) ); - $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ). "\n" ); + $wgOut->addHTML( Xml::element( 'h2', array( 'id' => 'metadata' ), wfMsg( 'metadata' ) ) . "\n" ); $wgOut->addWikiText( $this->makeMetadataTable( $formattedMetadata ) ); $wgOut->addScriptFile( 'metadata.js' ); $wgOut->addHTML( @@ -222,14 +230,18 @@ class ImagePage extends Article { * @return string */ protected function showTOC( $metadata ) { - global $wgLang; - $r = ''; - return $r; + $r = array( + '
  • ' . wfMsgHtml( 'file-anchor-link' ) . '
    • ', + '
  • ' . wfMsgHtml( 'filehist' ) . '
    • ', + '
  • ' . wfMsgHtml( 'imagelinks' ) . '
    • ', + ); + if ( $metadata ) { + $r[] = '
  • ' . wfMsgHtml( 'metadata' ) . '
    • '; + } + + wfRunHooks( 'ImagePageShowTOC', array( $this, &$r ) ); + + return ''; } /** @@ -241,8 +253,9 @@ class ImagePage extends Article { * @return string */ protected function makeMetadataTable( $metadata ) { - $r = wfMsg( 'metadata-help' ) . "\n\n"; - $r .= "{| id=mw_metadata class=mw_metadata\n"; + $r = "
    "; + $r .= wfMsgNoTrans( 'metadata-help' ); + $r .= "\n"; foreach ( $metadata as $type => $stuff ) { foreach ( $stuff as $v ) { # FIXME, why is this using escapeId for a class?! @@ -250,12 +263,12 @@ class ImagePage extends Article { if( $type == 'collapsed' ) { $class .= ' collapsable'; } - $r .= "|- class=\"$class\"\n"; - $r .= "!| {$v['name']}\n"; - $r .= "|| {$v['value']}\n"; + $r .= "\n"; + $r .= "\n"; + $r .= "\n"; } } - $r .= '|}'; + $r .= "
    {$v['name']}{$v['value']}
    \n
    \n"; return $r; } @@ -274,7 +287,8 @@ class ImagePage extends Article { } protected function openShowImage() { - global $wgOut, $wgUser, $wgImageLimits, $wgRequest, $wgLang, $wgContLang; + global $wgOut, $wgUser, $wgImageLimits, $wgRequest, + $wgLang, $wgContLang, $wgEnableUploads; $this->loadFile(); @@ -315,7 +329,7 @@ class ImagePage extends Article { $linkAttribs = array( 'href' => $full_url ); $longDesc = $this->displayImg->getLongDesc(); - wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this , &$wgOut ) ) ; + wfRunHooks( 'ImageOpenShowImageInlineBefore', array( &$this, &$wgOut ) ); if( $this->displayImg->allowInlineDisplay() ) { # image @@ -360,7 +374,8 @@ class ImagePage extends Article { '
    ' . Xml::tags( 'a', $linkAttribs, $msgbig ) . "$dirmark " . $longDesc; } - if( $this->displayImg->isMultipage() ) { + $isMulti = $this->displayImg->isMultipage() && $this->displayImg->pageCount() > 1; + if( $isMulti ) { $wgOut->addHTML( '' - . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '' : '' ) + . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ? '' : '' ) . '' - . '' + . ( $this->showThumb ? '' : '' ) . '' . '' . '' @@ -763,7 +844,7 @@ class ImageHistoryList { } public function endImageHistoryList( $navLinks = '' ) { - return "
    ' ); } @@ -371,15 +386,21 @@ class ImagePage extends Article { ); $wgOut->addHTML( '' ); + $anchorclose . "\n" ); } - if( $this->displayImg->isMultipage() ) { + if( $isMulti ) { $count = $this->displayImg->pageCount(); if( $page > 1 ) { $label = $wgOut->parse( wfMsg( 'imgmultipageprev' ), false ); - $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page-1) ); + $link = $sk->link( + $this->mTitle, + $label, + array(), + array( 'page' => $page - 1 ), + array( 'known', 'noclasses' ) + ); $thumb1 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none', array( 'page' => $page - 1 ) ); } else { @@ -388,7 +409,13 @@ class ImagePage extends Article { if( $page < $count ) { $label = wfMsg( 'imgmultipagenext' ); - $link = $sk->makeKnownLinkObj( $this->mTitle, $label, 'page='. ($page+1) ); + $link = $sk->link( + $this->mTitle, + $label, + array(), + array( 'page' => $page + 1 ), + array( 'known', 'noclasses' ) + ); $thumb2 = $sk->makeThumbLinkObj( $this->mTitle, $this->displayImg, $link, $label, 'none', array( 'page' => $page + 1 ) ); } else { @@ -427,8 +454,8 @@ class ImagePage extends Article { $icon= $this->displayImg->iconThumb(); $wgOut->addHTML( '' ); + $icon->toHtml( array( 'file-link' => true ) ) . + "\n" ); } $showLink = true; @@ -437,25 +464,26 @@ class ImagePage extends Article { if($showLink) { $filename = wfEscapeWikiText( $this->displayImg->getName() ); + $medialink = "[[Media:$filename|$filename]]"; if( !$this->displayImg->isSafeFile() ) { $warning = wfMsgNoTrans( 'mediawarning' ); $wgOut->addWikiText( << -[[Media:$filename|$filename]]$dirmark - $longDesc +{$medialink}$dirmark +$longDesc -
    $warning
    EOT ); } else { $wgOut->addWikiText( << -[[Media:$filename|$filename]]$dirmark $longDesc +{$medialink}{$dirmark} +$longDesc EOT - ); + ); } } @@ -464,12 +492,20 @@ EOT } } else { # Image does not exist - - $title = SpecialPage::getTitleFor( 'Upload' ); - $link = $sk->makeKnownLinkObj($title, wfMsgHtml('noimage-linktext'), - 'wpDestFile=' . urlencode( $this->displayImg->getName() ) ); + if ( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) { + // Only show an upload link if the user can upload + $uploadTitle = SpecialPage::getTitleFor( 'Upload' ); + $nofile = array( + 'filepage-nofile-link', + $uploadTitle->getFullUrl( array( 'wpDestFile' => $this->img->getName() ) ) + ); + } + else + { + $nofile = 'filepage-nofile'; + } $wgOut->setRobotPolicy( 'noindex,nofollow' ); - $wgOut->addHTML( wfMsgWikiHtml( 'noimage', $link ) ); + $wgOut->wrapWikiMsg( "", $nofile ); } } @@ -477,26 +513,24 @@ EOT * Show a notice that the file is from a shared repository */ protected function printSharedImageText() { - global $wgOut, $wgUser; + global $wgOut; $this->loadFile(); $descUrl = $this->img->getDescriptionUrl(); $descText = $this->img->getDescriptionText(); + + $wrap = "
    \n$1\n
    \n"; + $repo = $this->img->getRepo()->getDisplayName(); + $msg = ''; - if( $descUrl ) { - $sk = $wgUser->getSkin(); - $link = $sk->makeExternalLink( $descUrl, wfMsg( 'shareduploadwiki-linktext' ) ); - $msg = ( $descText ) ? 'shareduploadwiki-desc' : 'shareduploadwiki'; - $msg = wfMsgExt( $msg, array( 'parseinline', 'replaceafter' ), $link ); - if( $msg == '-' ) { - $msg = ''; - } + if( $descUrl && $descText && wfMsgNoTrans( 'sharedupload-desc-here' ) !== '-' ) { + $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-here', $repo, $descUrl ) ); + } elseif ( $descUrl && wfMsgNoTrans( 'sharedupload-desc-there' ) !== '-' ) { + $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload-desc-there', $repo, $descUrl ) ); + } else { + $wgOut->wrapWikiMsg( $wrap, array( 'sharedupload', $repo ), ''/*BACKCOMPAT*/ ); } - $s = "
    "; - $s .= wfMsgWikiHtml( 'sharedupload', $this->img->getRepo()->getDisplayName(), $msg ); - $s .= "
    "; - $wgOut->addHTML( $s ); if( $descText ) { $this->mExtraDescription = $descText; @@ -506,7 +540,10 @@ EOT public function getUploadUrl() { $this->loadFile(); $uploadTitle = SpecialPage::getTitleFor( 'Upload' ); - return $uploadTitle->getFullUrl( 'wpDestFile=' . urlencode( $this->img->getName() ) . '&wpForReUpload=1' ); + return $uploadTitle->getFullUrl( array( + 'wpDestFile' => $this->img->getName(), + 'wpForReUpload' => 1 + ) ); } /** @@ -514,7 +551,9 @@ EOT * external editing (and instructions link) etc. */ protected function uploadLinksBox() { - global $wgUser, $wgOut; + global $wgUser, $wgOut, $wgEnableUploads, $wgUseExternalEditor; + + if( !$wgEnableUploads ) { return; } $this->loadFile(); if( !$this->img->isLocal() ) @@ -522,19 +561,31 @@ EOT $sk = $wgUser->getSkin(); - $wgOut->addHTML( '
      ' ); + $wgOut->addHTML( "
        \n" ); # "Upload a new version of this file" link - if( UploadForm::userCanReUpload($wgUser,$this->img->name) ) { + if( UploadBase::userCanReUpload($wgUser,$this->img->name) ) { $ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) ); - $wgOut->addHTML( "
      • {$ulink}
        • " ); + $wgOut->addHTML( "
      • {$ulink}
        • \n" ); } # External editing link - $elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' ); - $wgOut->addHTML( '
      • ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . '
        • ' ); + if ( $wgUseExternalEditor ) { + $elink = $sk->link( + $this->mTitle, + wfMsgHtml( 'edit-externally' ), + array(), + array( + 'action' => 'edit', + 'externaledit' => 'true', + 'mode' => 'file' + ), + array( 'known', 'noclasses' ) + ); + $wgOut->addHTML( '
      • ' . $elink . ' ' . wfMsgExt( 'edit-externally-help', array( 'parseinline' ) ) . "
        • \n" ); + } - $wgOut->addHTML( '
      ' ); + $wgOut->addHTML( "
    \n" ); } protected function closeShowImage() {} # For overloading @@ -544,7 +595,7 @@ EOT * we follow it with an upload history of the image and its usage. */ protected function imageHistory() { - global $wgOut, $wgUseExternalEditor; + global $wgOut; $this->loadFile(); $pager = new ImageHistoryPseudoPager( $this ); @@ -554,7 +605,7 @@ EOT # Exist check because we don't want to show this on pages where an image # doesn't exist along with the noimage message, that would suck. -ævar - if( $wgUseExternalEditor && $this->img->exists() ) { + if( $this->img->exists() ) { $this->uploadLinksBox(); } } @@ -599,17 +650,23 @@ EOT $count++; if( $count <= $limit ) { // We have not yet reached the extra one that tells us there is more to fetch - $name = Title::makeTitle( $s->page_namespace, $s->page_title ); - $link = $sk->makeKnownLinkObj( $name, "" ); + $link = $sk->link( + Title::makeTitle( $s->page_namespace, $s->page_title ), + null, + array(), + array(), + array( 'known', 'noclasses' ) + ); $wgOut->addHTML( "
  • {$link}
    • \n" ); } } - $wgOut->addHTML( "\n" ); + $wgOut->addHTML( "\n" ); $res->free(); // Add a links to [[Special:Whatlinkshere]] if( $count > $limit ) $wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() ); + $wgOut->addHTML( "\n" ); } protected function imageRedirects() { @@ -626,7 +683,13 @@ EOT $sk = $wgUser->getSkin(); foreach ( $redirects as $title ) { - $link = $sk->makeKnownLinkObj( $title, "", "redirect=no" ); + $link = $sk->link( + $title, + null, + array(), + array( 'redirect' => 'no' ), + array( 'known', 'noclasses' ) + ); $wgOut->addHTML( "
  • {$link}
    • \n" ); } $wgOut->addHTML( "\n" ); @@ -650,9 +713,15 @@ EOT $sk = $wgUser->getSkin(); foreach ( $dupes as $file ) { $fromSrc = ''; - if( $file->isLocal() ) - $link = $sk->makeKnownLinkObj( $file->getTitle(), "" ); - else { + if( $file->isLocal() ) { + $link = $sk->link( + $file->getTitle(), + null, + array(), + array(), + array( 'known', 'noclasses' ) + ); + } else { $link = $sk->makeExternalLink( $file->getDescriptionUrl(), $file->getTitle()->getPrefixedText() ); $fromSrc = wfMsg( 'shared-repo-from', $file->getRepo()->getDisplayName() ); @@ -666,6 +735,13 @@ EOT * Delete the file, or an earlier version of it */ public function delete() { + global $wgUploadMaintenance; + if( $wgUploadMaintenance && $this->mTitle && $this->mTitle->getNamespace() == NS_FILE ) { + global $wgOut; + $wgOut->wrapWikiMsg( "
    \n$1
    \n", array( 'filedelete-maintenance' ) ); + return; + } + $this->loadFile(); if( !$this->img->exists() || !$this->img->isLocal() || $this->img->getRedirected() ) { // Standard article deletion @@ -697,7 +773,10 @@ EOT $this->img->upgradeRow(); $this->img->purgeCache(); } else { - wfDebug( "ImagePage::doPurge no image\n" ); + wfDebug( "ImagePage::doPurge no image for " . $this->img->getName() . "; limiting purge to cache only\n" ); + // even if the file supposedly doesn't exist, force any cached information + // to be updated (in case the cached information is wrong) + $this->img->purgeCache(); } parent::doPurge(); } @@ -723,15 +802,16 @@ EOT */ class ImageHistoryList { - protected $imagePage, $img, $skin, $title, $repo; + protected $imagePage, $img, $skin, $title, $repo, $showThumb; public function __construct( $imagePage ) { - global $wgUser; + global $wgUser, $wgShowArchiveThumbnails; $this->skin = $wgUser->getSkin(); $this->current = $imagePage->getFile(); $this->img = $imagePage->getDisplayedFile(); $this->title = $imagePage->getTitle(); $this->imagePage = $imagePage; + $this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender(); } public function getImagePage() { @@ -748,14 +828,15 @@ class ImageHistoryList { public function beginImageHistoryList( $navLinks = '' ) { global $wgOut, $wgUser; - return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) + return Xml::element( 'h2', array( 'id' => 'filehistory' ), wfMsg( 'filehist' ) ) . "\n" + . "
    \n" . $wgOut->parse( wfMsgNoTrans( 'filehist-help' ) ) - . $navLinks - . Xml::openElement( 'table', array( 'class' => 'filehistory' ) ) . "\n" + . $navLinks . "\n" + . Xml::openElement( 'table', array( 'class' => 'wikitable filehistory' ) ) . "\n" . '
    ' . wfMsgHtml( 'filehist-datetime' ) . '' . wfMsgHtml( 'filehist-thumb' ) . '' . wfMsgHtml( 'filehist-thumb' ) . '' . wfMsgHtml( 'filehist-dimensions' ) . '' . wfMsgHtml( 'filehist-user' ) . '' . wfMsgHtml( 'filehist-comment' ) . '
    \n$navLinks\n"; + return "\n$navLinks\n\n"; } public function imageHistoryLine( $iscur, $file ) { @@ -773,49 +854,45 @@ class ImageHistoryList { $img = $iscur ? $file->getName() : $file->getArchiveName(); $user = $file->getUser('id'); $usertext = $file->getUser('text'); - $size = $file->getSize(); $description = $file->getDescription(); - $dims = $file->getDimensionsString(); - $sha1 = $file->getSha1(); $local = $this->current->isLocal(); $row = $css = $selected = ''; // Deletion link - if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ) { + if( $local && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deletedhistory') ) ) { $row .= ''; # Link to remove from history if( $wgUser->isAllowed( 'delete' ) ) { - $q = array(); - $q[] = 'action=delete'; + $q = array( 'action' => 'delete' ); if( !$iscur ) - $q[] = 'oldimage=' . urlencode( $img ); - $row .= $this->skin->makeKnownLinkObj( + $q['oldimage'] = $img; + $row .= $this->skin->link( $this->title, wfMsgHtml( $iscur ? 'filehist-deleteall' : 'filehist-deleteone' ), - implode( '&', $q ) + array(), $q, array( 'known' ) ); } - # Link to hide content - if( $wgUser->isAllowed( 'deleterevision' ) ) { + # Link to hide content. Don't show useless link to people who cannot hide revisions. + $canHide = $wgUser->isAllowed( 'deleterevision' ); + if( $canHide || ($wgUser->isAllowed('deletedhistory') && $file->getVisibility()) ) { if( $wgUser->isAllowed('delete') ) { - $row .= '
    '; + $row .= '
    '; } - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); // If file is top revision or locked from this user, don't link if( $iscur || !$file->userCan(File::DELETED_RESTRICTED) ) { - $del = wfMsgHtml( 'rev-delundel' ); + $del = $this->skin->revDeleteLinkDisabled( $canHide ); } else { - // If the file was hidden, link to sha-1 - list($ts,$name) = explode('!',$img,2); - $del = $this->skin->makeKnownLinkObj( $revdel, wfMsg( 'rev-delundel' ), - 'target=' . urlencode( $wgTitle->getPrefixedText() ) . - '&oldimage=' . urlencode( $ts ) ); - // Bolden oversighted content - if( $file->isDeleted(File::DELETED_RESTRICTED) ) - $del = "$del"; + list( $ts, $name ) = explode( '!', $img, 2 ); + $query = array( + 'type' => 'oldimage', + 'target' => $wgTitle->getPrefixedText(), + 'ids' => $ts, + ); + $del = $this->skin->revDeleteLink( $query, + $file->isDeleted(File::DELETED_RESTRICTED), $canHide ); } - $row .= "$del"; + $row .= $del; } $row .= ''; } @@ -828,13 +905,17 @@ class ImageHistoryList { if( $file->isDeleted(File::DELETED_FILE) ) { $row .= wfMsgHtml('filehist-revert'); } else { - $q = array(); - $q[] = 'action=revert'; - $q[] = 'oldimage=' . urlencode( $img ); - $q[] = 'wpEditToken=' . urlencode( $wgUser->editToken( $img ) ); - $row .= $this->skin->makeKnownLinkObj( $this->title, + $row .= $this->skin->link( + $this->title, wfMsgHtml( 'filehist-revert' ), - implode( '&', $q ) ); + array(), + array( + 'action' => 'revert', + 'oldimage' => $img, + 'wpEditToken' => $wgUser->editToken( $img ) + ), + array( 'known', 'noclasses' ) + ); } } $row .= ''; @@ -847,43 +928,40 @@ class ImageHistoryList { if( !$file->userCan(File::DELETED_FILE) ) { # Don't link to unviewable files $row .= '' . $wgLang->timeAndDate( $timestamp, true ) . ''; - } else if( $file->isDeleted(File::DELETED_FILE) ) { + } elseif( $file->isDeleted(File::DELETED_FILE) ) { $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); # Make a link to review the image - $url = $this->skin->makeKnownLinkObj( $revdel, $wgLang->timeAndDate( $timestamp, true ), - "target=".$wgTitle->getPrefixedText()."&file=$sha1.".$this->current->getExtension() ); + $url = $this->skin->link( + $revdel, + $wgLang->timeAndDate( $timestamp, true ), + array(), + array( + 'target' => $wgTitle->getPrefixedText(), + 'file' => $img, + 'token' => $wgUser->editToken( $img ) + ), + array( 'known', 'noclasses' ) + ); $row .= ''.$url.''; } else { $url = $iscur ? $this->current->getUrl() : $this->current->getArchiveUrl( $img ); $row .= Xml::element( 'a', array( 'href' => $url ), $wgLang->timeAndDate( $timestamp, true ) ); } + $row .= ""; // Thumbnail - if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) { - $params = array( - 'width' => '120', - 'height' => '120', - ); - $thumbnail = $file->transform( $params ); - $options = array( - 'alt' => wfMsg( 'filehist-thumbtext', $wgLang->timeAndDate( $timestamp, true ) ), - 'file-link' => true, - ); - $row .= '' . ( $thumbnail ? $thumbnail->toHtml( $options ) : - wfMsgHtml( 'filehist-nothumb' ) ); - } else { - $row .= '' . wfMsgHtml( 'filehist-nothumb' ); + if ( $this->showThumb ) { + $row .= '' . $this->getThumbForLine( $file ) . ''; } - $row .= ""; - - // Image dimensions - $row .= htmlspecialchars( $dims ); - // File size - $row .= " (" . $this->skin->formatSize( $size ) . ')'; + // Image dimensions + size + $row .= ''; + $row .= htmlspecialchars( $file->getDimensionsString() ); + $row .= " (" . $this->skin->formatSize( $file->getSize() ) . ')'; + $row .= ''; // Uploading user - $row .= ''; + $row .= ''; if( $local ) { // Hide deleted usernames if( $file->isDeleted(File::DELETED_USER) ) { @@ -910,6 +988,33 @@ class ImageHistoryList { return "{$row}\n"; } + + protected function getThumbForLine( $file ) { + global $wgLang; + + if( $file->allowInlineDisplay() && $file->userCan( File::DELETED_FILE ) && !$file->isDeleted( File::DELETED_FILE ) ) { + $params = array( + 'width' => '120', + 'height' => '120', + ); + $timestamp = wfTimestamp(TS_MW, $file->getTimestamp()); + + $thumbnail = $file->transform( $params ); + $options = array( + 'alt' => wfMsg( 'filehist-thumbtext', + $wgLang->timeAndDate( $timestamp, true ), + $wgLang->date( $timestamp, true ), + $wgLang->time( $timestamp, true ) ), + 'file-link' => true, + ); + + if ( !$thumbnail ) return wfMsgHtml( 'filehist-nothumb' ); + + return $thumbnail->toHtml( $options ); + } else { + return wfMsgHtml( 'filehist-nothumb' ); + } + } } class ImageHistoryPseudoPager extends ReverseChronologicalPager { @@ -918,7 +1023,7 @@ class ImageHistoryPseudoPager extends ReverseChronologicalPager { $this->mImagePage = $imagePage; $this->mTitle = clone( $imagePage->getTitle() ); $this->mTitle->setFragment( '#filehistory' ); - $this->mImg = NULL; + $this->mImg = null; $this->mHist = array(); $this->mRange = array( 0, 0 ); // display range } -- cgit v1.2.3-54-g00ecf