Ignore:
Timestamp:
Jun 29, 2010, 2:26:43 AM (14 years ago)
Author:
plg
Message:

merge r6621 from branch 2.1 to trunk

bug 1742 fixed: if the EXIF functions are not available:

1) display a warning (but not an error)
2) avoid to try to read EXIF data

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r6617 r6622  
    216216</div>
    217217{else}
     218
     219  {if count($setup_warnings) > 0}
     220<div class="warnings">
     221  <ul>
     222    {foreach from=$setup_warnings item=warning}
     223    <li>{$warning}</li>
     224    {/foreach}
     225  </ul>
     226</div>
     227  {/if}
     228
    218229
    219230{if !empty($thumbnails)}
Note: See TracChangeset for help on using the changeset viewer.