diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-12-01 13:34:40 -0800 | 
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-12-01 13:34:40 -0800 | 
| commit | f9ebe009c306eecf7480cc7778266b61d53b077e (patch) | |
| tree | 37850050a331758804ea4170e8d98e65efdca063 /modules/gallery | |
| parent | 883fda313d3d7e76ae98cba7735c4c474b6f517c (diff) | |
Use the real mime type for movies when we're requesting the full movie
instead of a thumbnail.  Fixes ticket #925, thanks to lsowen.
Diffstat (limited to 'modules/gallery')
| -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 acfd6eb9..ef4f302c 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 ($type != "albums" && in_array($item->mime_type, array("video/x-flv", "video/mp4"))) {        header("Content-type: image/jpeg");      } else {        header("Content-Type: $item->mime_type"); | 
