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/views | |
| parent | 213807a8073138a98b8daf9fe265e981454aaa50 (diff) | |
| parent | 0389dceb475597ecdedf519d27d6d7bb36aa6276 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/form_uploadify.html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php index 4676fcef..937a37b6 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -9,7 +9,7 @@ uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", script: "<?= url::site("flash_uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, - fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4", + fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.m4v;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4;*.M4V", fileDesc: <?= t("Photos and movies")->for_js() ?>, cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>", simUploadLimit: <?= $simultaneous_upload_limit ?>, |