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
Piwigo · May 31, 2013 · eb002c4 · eb002c4
1 parent c8d5ad2
commit eb002c4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/admin/site_manager.php b/admin/site_manager.php
@@ -31,6 +31,12 @@
 // +-----------------------------------------------------------------------+
 // | 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
@@ -31,6 +31,12 @@
 // +-----------------------------------------------------------------------+
 // | 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']))