diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-01-19 23:50:47 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-01-19 23:50:47 -0800 |
| commit | 38797ad82adf918a809628d451f743be7c14ee4b (patch) | |
| tree | 22deb38f8de70d781b79b2cde4780ee4edd2cbdc /modules/gallery/controllers | |
| parent | dc3f2f637e720dd456a406859417ccb39184bedc (diff) | |
| parent | 1927dd00e42062a98855d121ec8427b25d74d015 (diff) | |
Merge pull request #94 from shadlaws/fix_1949
#1949 - Fix album thumb mime types given by data_rest and file_proxy
Diffstat (limited to 'modules/gallery/controllers')
| -rw-r--r-- | modules/gallery/controllers/file_proxy.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php index 9af58c0c..b2120455 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -126,8 +126,8 @@ class File_Proxy_Controller extends Controller { expires::set(2592000, $item->updated); // 30 days - // Dump out the image. If the item is a movie, then its thumbnail will be a JPG. - if ($item->is_movie() && $type != "albums") { + // Dump out the image. If the item is a movie or album, then its thumbnail will be a JPG. + if (($item->is_movie() || $item->is_album()) && $type == "thumbs") { header("Content-Type: image/jpeg"); } else { header("Content-Type: $item->mime_type"); |