diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-11 09:09:52 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-11 09:09:52 -0700 |
| commit | 329abfe539371b65c95e3334e436f997ec92879f (patch) | |
| tree | 0a3ee6e19be8563af6b6b6d87db795a0e6f463e2 /modules/gallery/models | |
| parent | 213807a8073138a98b8daf9fe265e981454aaa50 (diff) | |
| parent | 0389dceb475597ecdedf519d27d6d7bb36aa6276 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/models')
| -rw-r--r-- | modules/gallery/models/item.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 4d05e4da..eb200fa5 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -364,7 +364,7 @@ class Item_Model extends ORM_MPTT { $this->name .= "." . $pi["extension"]; } - $this->mime_type = strtolower($pi["extension"]) == "mp4" ? "video/mp4" : "video/x-flv"; + $this->mime_type = in_array(strtolower($pi["extension"]), array("mp4", "m4v")) ? "video/mp4" : "video/x-flv"; } } |