diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-12-01 19:44:29 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-01 19:44:29 -0800 |
| commit | c803cb29091d3b069077d7711a2485f75f274835 (patch) | |
| tree | f0ebcdacf6d749e6e2ebc47be4634a7eb13c2d5d /modules/gallery/controllers/file_proxy.php | |
| parent | 53df0df0a4f9d2d5369016a7e2ea983ffe202346 (diff) | |
| parent | 6fa880777cb3b61c0e380ebd5e7b83de55a8d6d4 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'modules/gallery/controllers/file_proxy.php')
| -rw-r--r-- | modules/gallery/controllers/file_proxy.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php index 53afe0e4..8c46de08 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -112,7 +112,7 @@ class File_Proxy_Controller extends Controller { Session::abort_save(); // Dump out the image. If the item is a movie, then its thumbnail will be a JPG. - if (in_array($item->mime_type, array("video/x-flv", "video/mp4"))) { + if ($item->is_movie() && $type != "albums") { header("Content-type: image/jpeg"); } else { header("Content-Type: $item->mime_type"); |