diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2010-07-04 21:53:57 +0200 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-07-10 08:09:04 -0700 |
| commit | 39962eaddc17f27eb1baa694ac588138439621d4 (patch) | |
| tree | e5bd4465b46cd12f0afddc4934755043b7716bb7 /modules/gallery/controllers/file_proxy.php | |
| parent | 9d66783f47636153bf3661d1d89e694dd5188c36 (diff) | |
Accept extension .m4v as video/mp4
Diffstat (limited to 'modules/gallery/controllers/file_proxy.php')
| -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 32690fc0..bead9f3f 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -72,10 +72,10 @@ class File_Proxy_Controller extends Controller { // necessary, it's easily resurrected. // If we're looking for a .jpg then it's it's possible that we're requesting the thumbnail - // for a movie. In that case, the .flv or .mp4 file would have been converted to a .jpg. + // for a movie. In that case, the .flv, .mp4 or .m4v file would have been converted to a .jpg. // So try some alternate types: if (preg_match('/.jpg$/', $path)) { - foreach (array("flv", "mp4") as $ext) { + foreach (array("flv", "mp4", "m4v") as $ext) { $movie_path = preg_replace('/.jpg$/', ".$ext", $encoded_path); $item = ORM::factory("item")->where("relative_path_cache", "=", $movie_path)->find(); if ($item->loaded()) { |