aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include/photos_add_direct_prepare.inc.php
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--admin/include/photos_add_direct_prepare.inc.php20
1 files changed, 8 insertions, 12 deletions
diff --git a/admin/include/photos_add_direct_prepare.inc.php b/admin/include/photos_add_direct_prepare.inc.php
index c917d12bd..34b025f13 100644
--- a/admin/include/photos_add_direct_prepare.inc.php
+++ b/admin/include/photos_add_direct_prepare.inc.php
@@ -93,21 +93,17 @@ $template->assign(
)
);
-$upload_file_types = 'jpeg, png, gif';
-
-if (pwg_image::get_library() == 'ext_imagick')
-{
- $upload_file_types.= ', tiff';
- $template->assign('tif_enabled', true);
-}
+$unique_exts = array_unique(
+ array_map(
+ 'strtolower',
+ $conf['upload_form_all_types'] ? $conf['file_ext'] : $conf['picture_ext']
+ )
+ );
-if (false) // TODO manage zip files in pwg.images.upload
-{
- $upload_file_types.= ', zip';
-}
$template->assign(
array(
- 'upload_file_types' => $upload_file_types,
+ 'upload_file_types' => implode(', ', $unique_exts),
+ 'file_exts' => implode(',', $unique_exts),
)
);