archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r6361 from branch 2.1 to trunk

Browse source 
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
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/configuration.php
View file

@ -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']);