(bug 17747) Only display thumbnail column in file history if the image can be rendered.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6c9a700..5acf13d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -539,6 +539,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18436) JavaScript-added AJAX messages (from the JS watch/unwatch, for 
   instance) no longer include a redundant "display:block" hardcoded style.
 * (bug 20802) Fixed thumb.php redirect handling
+* (bug 17747) Only display thumbnail column in file history if the image can 
+  be rendered.
 
 == API changes in 1.16 ==
 

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 05e9e3a..7a0605f 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -798,7 +798,7 @@ class ImageHistoryList {
                $this->img = $imagePage->getDisplayedFile();
                $this->title = $imagePage->getTitle();
                $this->imagePage = $imagePage;
-               $this->showThumb = $wgShowArchiveThumbnails;
+               $this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender();
        }
 
        public function getImagePage() {