Ignore:
Timestamp:
Jun 28, 2010, 10:58:38 PM (14 years ago)
Author:
plg
Message:

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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/themes/default/template/photos_add_direct.tpl

    r6363 r6617  
    107107    'buttonText'     : buttonText,
    108108    'multi'          : true,
    109     'fileDesc'       : 'Photo files (*.jpg,*.jpeg)',
    110     'fileExt'        : '*.jpg;*.JPG;*.jpeg;*.JPEG',
     109    'fileDesc'       : 'Photo files (*.jpg,*.jpeg,*.png)',
     110    'fileExt'        : '*.jpg;*.JPG;*.jpeg;*.JPEG;*.png;*.PNG',
    111111    'onAllComplete'  : function(event, data) {
    112112      if (data.errors) {
Note: See TracChangeset for help on using the changeset viewer.