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/photos_add.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'admin/photos_add.php')

diff --git a/admin/photos_add.php b/admin/photos_add.php
index af3b84211..54db3113c 100644
--- a/admin/photos_add.php
+++ b/admin/photos_add.php
@@ -152,12 +152,19 @@ $tabs = array(
     'code' => 'ploader',
     'label' => l10n('Piwigo Uploader'),
     ),
-  array(
-    'code' => 'ftp',
-    'label' => l10n('FTP + Synchronization'),
-    ),
   );
 
+if ($conf['enable_synchronization'])
+{
+  array_push(
+    $tabs,
+    array(
+      'code' => 'ftp',
+      'label' => l10n('FTP + Synchronization'),
+      )
+    );
+}
+
 $tab_codes = array_map(
   create_function('$a', 'return $a["code"];'),
   $tabs
-- 
cgit v1.2.3