From c6d981cc58f337a7f2c6a303f5748253034cc59d Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 28 Jun 2010 20:58:38 +0000 Subject: 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 --- admin/themes/default/template/photos_add_direct.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'admin/themes/default') 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; -- cgit v1.2.3