aboutsummaryrefslogtreecommitdiffstats
path: root/include
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 /include
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 'include')
-rw-r--r--include/config_default.inc.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index b833f0bb5..360bac36a 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -780,4 +780,7 @@ $conf['ploader_download_mac'] = 'http://piwigo.org/ext/download.php?eid=353';
// pLoader direct download url for linux
$conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269';
+
+// enable the synchronization method for adding photos
+$conf['enable_synchronization'] = true;
?>