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
This commit is contained in:
plegall
2013-05-31 12:23:45 +00:00
parent c8d5ad2d77
commit eb002c40a4
2 changed files with 12 additions and 0 deletions

View File

@@ -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']))

View File

@@ -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']))