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:
parent
2659784b20
commit
eccc2dd434
1 changed files with 15 additions and 8 deletions
|
@ -37,6 +37,12 @@ $plugins = new plugins();
|
|||
|
||||
//--------------------------------------------------perform requested actions
|
||||
if (isset($_GET['action']) and isset($_GET['plugin']))
|
||||
{
|
||||
if (in_array($_GET['action'], array('install', 'uninstall')) AND !is_webmaster())
|
||||
{
|
||||
array_push($page['errors'], l10n('Webmaster status is required.'));
|
||||
}
|
||||
else
|
||||
{
|
||||
check_pwg_token();
|
||||
|
||||
|
@ -51,6 +57,7 @@ if (isset($_GET['action']) and isset($_GET['plugin']))
|
|||
redirect($base_url);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------Tabsheet
|
||||
$plugins->set_tabsheet($page['page']);
|
||||
|
|
Loading…
Add table
Reference in a new issue