summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/flash_uploader.php
diff options
context:
space:
mode:
authorRomain LE DISEZ <romain.git@ledisez.net>2010-07-04 21:53:57 +0200
committerBharat Mediratta <bharat@menalto.com>2010-07-10 08:09:04 -0700
commit39962eaddc17f27eb1baa694ac588138439621d4 (patch)
treee5bd4465b46cd12f0afddc4934755043b7716bb7 /modules/gallery/controllers/flash_uploader.php
parent9d66783f47636153bf3661d1d89e694dd5188c36 (diff)
Accept extension .m4v as video/mp4
Diffstat (limited to 'modules/gallery/controllers/flash_uploader.php')
-rw-r--r--modules/gallery/controllers/flash_uploader.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/controllers/flash_uploader.php b/modules/gallery/controllers/flash_uploader.php
index f7da5124..bc8b964f 100644
--- a/modules/gallery/controllers/flash_uploader.php
+++ b/modules/gallery/controllers/flash_uploader.php
@@ -50,7 +50,7 @@ class Flash_Uploader_Controller extends Controller {
// Uploadify adds its own field to the form, so validate that separately.
$file_validation = new Validation($_FILES);
$file_validation->add_rules(
- "Filedata", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4]");
+ "Filedata", "upload::valid", "upload::required", "upload::type[gif,jpg,jpeg,png,flv,mp4,m4v]");
if ($form->validate() && $file_validation->validate()) {
$temp_filename = upload::save("Filedata");
@@ -63,7 +63,7 @@ class Flash_Uploader_Controller extends Controller {
$path_info = @pathinfo($temp_filename);
if (array_key_exists("extension", $path_info) &&
- in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
+ in_array(strtolower($path_info["extension"]), array("flv", "mp4", "m4v"))) {
$item->type = "movie";
$item->save();
log::success("content", t("Added a movie"),