From 5f597c2cbabc9002886a056b3e513ceed27a99bf Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 26 May 2010 00:20:07 +0000
Subject: merge r6361 from branch 2.1 to trunk

feature 1697: ability to deactivate the synchronization method to add photos.


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

(limited to 'admin/themes/default/template/element_set_global.tpl')

diff --git a/admin/themes/default/template/element_set_global.tpl b/admin/themes/default/template/element_set_global.tpl
index 3a5e738e0..288ceff9b 100644
--- a/admin/themes/default/template/element_set_global.tpl
+++ b/admin/themes/default/template/element_set_global.tpl
@@ -85,7 +85,9 @@
   {if isset($show_delete_form) }
   <fieldset>
     <legend>{'Deletions'|@translate}</legend>
+{if $ENABLE_SYNCHRONIZATION}
     <p style="font-style:italic">{'Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'|@translate}</p>
+{/if}
     <p>
       {'target'|@translate}
       <label><input type="radio" name="target_deletion" value="all"> {'all'|@translate}</label>
-- 
cgit v1.2.3