aboutsummaryrefslogtreecommitdiffstats
path: root/admin/photos_add.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-05-26 00:20:07 +0000
committerplegall <plg@piwigo.org>2010-05-26 00:20:07 +0000
commit5f597c2cbabc9002886a056b3e513ceed27a99bf (patch)
tree0e2cadaf603bdc234896648dfdb8687936f84a9d /admin/photos_add.php
parent9cf8684aa0a37273f6204efe9644178325f003e3 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/photos_add.php15
1 files changed, 11 insertions, 4 deletions
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