adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 00:53:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 9cf8684aa0
commit 5f597c2cba
24 changed files with 100 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/help.php
+25 -23
View File
@@ -33,31 +33,33 @@ $link = get_root_url().'admin.php?page=help&section=';
$selected = null;
$help_section_title = null;
$tabs = array(
array(
'code' => 'add_photos',
'label' => l10n('Add Photos'),
),
array(
'code' => 'permissions',
'label' => l10n('Permissions'),
),
array(
'code' => 'groups',
'label' => l10n('Groups'),
),
array(
$tabs = array();
$tabs[] = array(
'code' => 'add_photos',
'label' => l10n('Add Photos'),
);
$tabs[] = array(
'code' => 'permissions',
'label' => l10n('Permissions'),
);
$tabs[] = array(
'code' => 'groups',
'label' => l10n('Groups'),
);
if ($conf['enable_synchronization'])
{
$tabs[] = array(
'code' => 'user_upload',
'label' => l10n('User Upload'),
),
array(
'code' => 'virtual_links',
'label' => l10n('Virtual Links'),
),
array(
'code' => 'misc',
'label' => l10n('Miscellaneous'),
),
);
}
$tabs[] = array(
'code' => 'virtual_links',
'label' => l10n('Virtual Links'),
);
$tabs[] = array(
'code' => 'misc',
'label' => l10n('Miscellaneous'),
);
if (!isset($_GET['section']))