From de5efe8330ecc09bd37fa93bd0c0560574591ba1 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Tue, 29 Jun 2010 00:26:43 +0000
Subject: 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



git-svn-id: http://piwigo.org/svn/trunk@6622 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/template/photos_add_direct.tpl | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'admin/themes/default/template')

diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index b7684f430..ff1ada8e2 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -216,6 +216,17 @@ var buttonText = 'Browse';
 </div>
 {else}
 
+  {if count($setup_warnings) > 0}
+<div class="warnings">
+  <ul>
+    {foreach from=$setup_warnings item=warning}
+    <li>{$warning}</li>
+    {/foreach}
+  </ul>
+</div>
+  {/if}
+
+
 {if !empty($thumbnails)}
 <fieldset>
   <legend>{'Uploaded Photos'|@translate}</legend>
-- 
cgit v1.2.3