diff options
author | plegall <plg@piwigo.org> | 2010-05-26 00:20:07 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2010-05-26 00:20:07 +0000 |
commit | 5f597c2cbabc9002886a056b3e513ceed27a99bf (patch) | |
tree | 0e2cadaf603bdc234896648dfdb8687936f84a9d /admin/cat_options.php | |
parent | 9cf8684aa0a37273f6204efe9644178325f003e3 (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 'admin/cat_options.php')
-rw-r--r-- | admin/cat_options.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/admin/cat_options.php b/admin/cat_options.php index 2daa2a539..b36083c49 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -162,7 +162,10 @@ $tabsheet = new tabsheet(); $opt_link = $link_start.'cat_options&section='; $tabsheet->add('status', l10n('Public / Private'), $opt_link.'status'); $tabsheet->add('visible', l10n('Lock'), $opt_link.'visible'); -$tabsheet->add('upload', l10n('Upload'), $opt_link.'upload'); +if ($conf['enable_synchronization']) +{ + $tabsheet->add('upload', l10n('Upload'), $opt_link.'upload'); +} $tabsheet->add('comments', l10n('Comments'), $opt_link.'comments'); if ($conf['allow_random_representative']) { |