diff options
| author | plegall <plg@piwigo.org> | 2010-06-28 20:58:38 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-06-28 20:58:38 +0000 |
| commit | c6d981cc58f337a7f2c6a303f5748253034cc59d (patch) | |
| tree | a3992c0cb0db4bc1674dbbce1feb095cfb6628a6 /admin/themes | |
| parent | 7125711f5958e81d66ef8a22eafddebc7fb9d5cd (diff) | |
merge r6616 from branch 2.1 to trunk
bug 1701 fixed: support for PNG file in browser direct upload.
If the picture is a PNG file, then the "web size" picture is also a PNG file
but the thumbnail is always a JPEG file.
git-svn-id: http://piwigo.org/svn/trunk@6617 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/themes')
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index ffa5e2415..b7684f430 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -106,8 +106,8 @@ var buttonText = 'Browse'; 'displayData' : 'speed', 'buttonText' : buttonText, 'multi' : true, - 'fileDesc' : 'Photo files (*.jpg,*.jpeg)', - 'fileExt' : '*.jpg;*.JPG;*.jpeg;*.JPEG', + 'fileDesc' : 'Photo files (*.jpg,*.jpeg,*.png)', + 'fileExt' : '*.jpg;*.JPG;*.jpeg;*.JPEG;*.png;*.PNG', 'onAllComplete' : function(event, data) { if (data.errors) { return false; |