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
This commit is contained in:
plegall
2010-05-26 00:20:07 +00:00
parent 9cf8684aa0
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions
+4 -1
View File
@@ -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'])
{