| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -780,15 +780,16 @@ |
| 781 | 781 | */ |
| 782 | 782 | class ImageHistoryList { |
| 783 | 783 | |
| 784 | | - protected $imagePage, $img, $skin, $title, $repo; |
| | 784 | + protected $imagePage, $img, $skin, $title, $repo, $showThumb; |
| 785 | 785 | |
| 786 | 786 | public function __construct( $imagePage ) { |
| 787 | | - global $wgUser; |
| | 787 | + global $wgUser, $wgShowArchiveThumbnails; |
| 788 | 788 | $this->skin = $wgUser->getSkin(); |
| 789 | 789 | $this->current = $imagePage->getFile(); |
| 790 | 790 | $this->img = $imagePage->getDisplayedFile(); |
| 791 | 791 | $this->title = $imagePage->getTitle(); |
| 792 | 792 | $this->imagePage = $imagePage; |
| | 793 | + $this->showThumb = $wgShowArchiveThumbnails; |
| 793 | 794 | } |
| 794 | 795 | |
| 795 | 796 | public function getImagePage() { |
| — | — | @@ -813,7 +814,7 @@ |
| 814 | 815 | . '<tr><td></td>' |
| 815 | 816 | . ( $this->current->isLocal() && ($wgUser->isAllowed('delete') || $wgUser->isAllowed('deleterevision') ) ? '<td></td>' : '' ) |
| 816 | 817 | . '<th>' . wfMsgHtml( 'filehist-datetime' ) . '</th>' |
| 817 | | - . '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' |
| | 818 | + . ( $this->showThumb ? '<th>' . wfMsgHtml( 'filehist-thumb' ) . '</th>' : '' ) |
| 818 | 819 | . '<th>' . wfMsgHtml( 'filehist-dimensions' ) . '</th>' |
| 819 | 820 | . '<th>' . wfMsgHtml( 'filehist-user' ) . '</th>' |
| 820 | 821 | . '<th>' . wfMsgHtml( 'filehist-comment' ) . '</th>' |
| — | — | @@ -933,7 +934,9 @@ |
| 934 | 935 | $row .= "</td>"; |
| 935 | 936 | |
| 936 | 937 | // Thumbnail |
| 937 | | - $row .= '<td>' . $this->getThumbForLine( $file ) . '</td>'; |
| | 938 | + if ( $this->showThumb ) { |
| | 939 | + $row .= '<td>' . $this->getThumbForLine( $file ) . '</td>'; |
| | 940 | + } |
| 938 | 941 | |
| 939 | 942 | // Image dimensions + size |
| 940 | 943 | $row .= '<td>'; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2190,6 +2190,11 @@ |
| 2191 | 2191 | */ |
| 2192 | 2192 | $wgGenerateThumbnailOnParse = true; |
| 2193 | 2193 | |
| | 2194 | +/** |
| | 2195 | + * Show thumbnails for old images on the image description page |
| | 2196 | + */ |
| | 2197 | +$wgShowArchiveThumbnails = true; |
| | 2198 | + |
| 2194 | 2199 | /** Whether or not to use image resizing */ |
| 2195 | 2200 | $wgUseImageResize = true; |
| 2196 | 2201 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -122,6 +122,8 @@ |
| 123 | 123 | * Removed name attribute from <a id="top"></a>. |
| 124 | 124 | * Parser::setFunctionTagHook now can be used to add a new tag which is parsed at |
| 125 | 125 | preprocesor level. |
| | 126 | +* Added $wgShowArchiveThumbnails, allowing sysadmins to disable thumbnail |
| | 127 | + display for old versions of images. |
| 126 | 128 | |
| 127 | 129 | === Bug fixes in 1.16 === |
| 128 | 130 | |