diff options
| author | Nathan Kinkade <nath@nkinka.de> | 2011-08-11 19:07:45 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nath@nkinka.de> | 2011-08-11 19:07:45 +0000 |
| commit | d8dffba94277c2179a59eb72d6927a5bdb879648 (patch) | |
| tree | d377bd9d2e1e277ca93cc7fc17c73edae5286706 /modules/gallery/views | |
| parent | 2ec6e8d61b63ac5d3fc5cbd6761360539cd9d5e9 (diff) | |
| parent | a5b1972bbe9676479886ca94bb23f09407a87561 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
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 83dfcc68..ba4a3621 100644 --- a/modules/gallery/views/form_uploadify.html.php +++ b/modules/gallery/views/form_uploadify.html.php @@ -28,7 +28,7 @@ uploader: "<?= url::file("lib/uploadify/uploadify.swf") ?>", script: "<?= url::site("uploader/add_photo/{$album->id}") ?>", scriptData: <?= json_encode($script_data) ?>, - fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.GIF;*.JPG;*.JPEG;*.PNG<? if ($movies_allowed): ?>;*.flv;*.mp4;*.m4v;*.FLV;*.MP4;*.M4V<? endif ?>", + fileExt: "<?= implode(";", $extensions) ?>", fileDesc: <?= t("Photos and movies")->for_js() ?>, cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>", simUploadLimit: <?= $simultaneous_upload_limit ?>, |