aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-05-31 12:23:45 +0000
committerplegall <plg@piwigo.org>2013-05-31 12:23:45 +0000
commiteb002c40a430e4fba2da85077dfd19ae6b422b01 (patch)
treee88bc0350ad08975a0aa9623d4324775e152195e
parentc8d5ad2d770eb39c2a85f3e873fd41f57359ad1c (diff)
merge r22978 from branch 2.5 to trunk
bug 2915 fixed: really disable synchronization on synchronization and site (directories) manager screens. git-svn-id: http://piwigo.org/svn/trunk@22979 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/site_manager.php6
-rw-r--r--admin/site_update.php6
2 files changed, 12 insertions, 0 deletions
diff --git a/admin/site_manager.php b/admin/site_manager.php
index 4730b3c77..da75a0e59 100644
--- a/admin/site_manager.php
+++ b/admin/site_manager.php
@@ -31,6 +31,12 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
// +-----------------------------------------------------------------------+
+
+if (!$conf['enable_synchronization'])
+{
+ die('synchronization is disabled');
+}
+
check_status(ACCESS_ADMINISTRATOR);
if (!empty($_POST) or isset($_GET['action']))
diff --git a/admin/site_update.php b/admin/site_update.php
index 764aecab9..c705d3690 100644
--- a/admin/site_update.php
+++ b/admin/site_update.php
@@ -31,6 +31,12 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
// +-----------------------------------------------------------------------+
// | Check Access and exit when user status is not ok |
// +-----------------------------------------------------------------------+
+
+if (!$conf['enable_synchronization'])
+{
+ die('synchronization is disabled');
+}
+
check_status(ACCESS_ADMINISTRATOR);
if (!is_numeric($_GET['site']))