From 4190640550ea53a94b9ef9a28f9cb9273a41b397 Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Fri, 25 Sep 2009 14:48:44 +0000 Subject: [PATCH] (bug 17747) Only display thumbnail column in file history if the image can be rendered. --- RELEASE-NOTES | 2 ++ includes/ImagePage.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 6c9a7009f6..5acf13d203 100644 --- 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 05e9e3a378..7a0605f59d 100644 --- 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() { -- 2.20.1