archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r9995 from trunk to branch 2.2

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.2@10007 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2011-04-03 08:58:20 +00:00
parent 2659784b20
commit eccc2dd434
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
admin/plugins_list.php
View file

@ -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);
}
}