mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-03-28 17:42:57 +01:00
merge r9995 from trunk to branch 2.2
git-svn-id: http://piwigo.org/svn/branches/2.2@10007 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -38,17 +38,24 @@ $plugins = new plugins();
|
||||
//--------------------------------------------------perform requested actions
|
||||
if (isset($_GET['action']) and isset($_GET['plugin']))
|
||||
{
|
||||
check_pwg_token();
|
||||
|
||||
$page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']);
|
||||
|
||||
if (empty($page['errors']))
|
||||
if (in_array($_GET['action'], array('install', 'uninstall')) AND !is_webmaster())
|
||||
{
|
||||
if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate')
|
||||
array_push($page['errors'], l10n('Webmaster status is required.'));
|
||||
}
|
||||
else
|
||||
{
|
||||
check_pwg_token();
|
||||
|
||||
$page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']);
|
||||
|
||||
if (empty($page['errors']))
|
||||
{
|
||||
$template->delete_compiled_templates();
|
||||
if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate')
|
||||
{
|
||||
$template->delete_compiled_templates();
|
||||
}
|
||||
redirect($base_url);
|
||||
}
|
||||
redirect($base_url);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user