Ignore:
Timestamp:
May 26, 2010, 2:20:07 AM (14 years ago)
Author:
plg
Message:

merge r6361 from branch 2.1 to trunk

feature 1697: ability to deactivate the synchronization method to add photos.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/cat_options.php

    r6363 r6365  
    163163$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
    164164$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
    165 $tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
     165if ($conf['enable_synchronization'])
     166{
     167  $tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
     168}
    166169$tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
    167170if ($conf['allow_random_representative'])
Note: See TracChangeset for help on using the changeset viewer.