aboutsummaryrefslogtreecommitdiffstats
path: root/admin.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-05-26 00:20:07 +0000
committerplegall <plg@piwigo.org>2010-05-26 00:20:07 +0000
commit5f597c2cbabc9002886a056b3e513ceed27a99bf (patch)
tree0e2cadaf603bdc234896648dfdb8687936f84a9d /admin.php
parent9cf8684aa0a37273f6204efe9644178325f003e3 (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 '')
-rw-r--r--admin.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin.php b/admin.php
index c80fa508c..25eca3f6e 100644
--- a/admin.php
+++ b/admin.php
@@ -102,6 +102,7 @@ $template->set_filenames(array('admin' => 'admin.tpl'));
$template->assign(
array(
'USERNAME' => $user['username'],
+ 'ENABLE_SYNCHRONIZATION' => $conf['enable_synchronization'],
'U_SITE_MANAGER'=> $link_start.'site_manager',
'U_HISTORY_STAT'=> $link_start.'stats',
'U_FAQ'=> $link_start.'help',