| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -798,7 +798,7 @@ |
| 799 | 799 | $this->img = $imagePage->getDisplayedFile(); |
| 800 | 800 | $this->title = $imagePage->getTitle(); |
| 801 | 801 | $this->imagePage = $imagePage; |
| 802 | | - $this->showThumb = $wgShowArchiveThumbnails; |
| | 802 | + $this->showThumb = $wgShowArchiveThumbnails && $this->img->canRender(); |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | public function getImagePage() { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -539,6 +539,8 @@ |
| 540 | 540 | * (bug 18436) JavaScript-added AJAX messages (from the JS watch/unwatch, for |
| 541 | 541 | instance) no longer include a redundant "display:block" hardcoded style. |
| 542 | 542 | * (bug 20802) Fixed thumb.php redirect handling |
| | 543 | +* (bug 17747) Only display thumbnail column in file history if the image can |
| | 544 | + be rendered. |
| 543 | 545 | |
| 544 | 546 | == API changes in 1.16 == |
| 545 | 547 | |