From 5f597c2cbabc9002886a056b3e513ceed27a99bf Mon Sep 17 00:00:00 2001 From: plegall 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/configuration.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'admin/configuration.php') diff --git a/admin/configuration.php b/admin/configuration.php index 2b293a3ab..83a44004e 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -221,7 +221,10 @@ $tabsheet->add('main', l10n('Main'), $conf_link.'main'); $tabsheet->add('display', l10n('Display'), $conf_link.'display'); $tabsheet->add('history', l10n('History'), $conf_link.'history'); $tabsheet->add('comments', l10n('Comments'), $conf_link.'comments'); -$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload'); +if ($conf['enable_synchronization']) +{ + $tabsheet->add('upload', l10n('Upload'), $conf_link.'upload'); +} $tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default'); // TabSheet selection $tabsheet->select($page['section']); -- cgit v1.2.3