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/server_add/controllers/server_add.php | |
| parent | 9d66783f47636153bf3661d1d89e694dd5188c36 (diff) | |
Accept extension .m4v as video/mp4
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index 715274ab..0a691c8a 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -55,7 +55,7 @@ class Server_Add_Controller extends Admin_Controller { } if (!is_dir($file)) { $ext = strtolower(pathinfo($file, PATHINFO_EXTENSION)); - if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) { + if (!in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v"))) { continue; } } @@ -162,7 +162,7 @@ class Server_Add_Controller extends Admin_Controller { $queue[] = array($child, $entry_id); } else { $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION)); - if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4")) && + if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4", "m4v")) && filesize($child) > 0) { $child_entry = ORM::factory("server_add_file"); $child_entry->task_id = $task->id; @@ -249,7 +249,7 @@ class Server_Add_Controller extends Admin_Controller { $photo->owner_id = $owner_id; $photo->save(); $entry->item_id = $photo->id; - } else if (in_array($extension, array("flv", "mp4"))) { + } else if (in_array($extension, array("flv", "mp4", "m4v"))) { $movie = ORM::factory("item"); $movie->type = "movie"; $movie->parent_id = $parent->id; |