summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/uploader.php
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-12-10 22:35:46 +0000
committerNathan Kinkade <nath@nkinka.de>2012-12-10 22:35:46 +0000
commitdf12e1bcf7547802a94a7b492cdb22fca9ec6e1c (patch)
treef9a9b747456b534a661c65fc401b506f3dc4ee84 /modules/gallery/controllers/uploader.php
parentfc7750c742d30c6ebd42a12c9d468f54e90d470d (diff)
parent7c62c67d56e854f69a411dd56c48ef066f951c48 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
-rw-r--r--modules/gallery/controllers/uploader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 4ea55ff6..ecb0ca89 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -69,7 +69,7 @@ class 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", "m4v"))) {
+ in_array(strtolower($path_info["extension"]), legal_file::get_movie_extensions())) {
$item->type = "movie";
$item->save();
log::success("content", t("Added a movie"),