Changeset 10007


Ignore:
Timestamp:
Apr 3, 2011, 10:58:20 AM (13 years ago)
Author:
mistic100
Message:

merge r9995 from trunk to branch 2.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2/admin/plugins_list.php

    r8728 r10007  
    3939if (isset($_GET['action']) and isset($_GET['plugin']))
    4040{
    41   check_pwg_token();
     41  if (in_array($_GET['action'], array('install', 'uninstall')) AND !is_webmaster())
     42  {
     43    array_push($page['errors'], l10n('Webmaster status is required.'));
     44  }
     45  else
     46  {
     47    check_pwg_token();
    4248
    43   $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']);
     49    $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']);
    4450
    45   if (empty($page['errors']))
    46   {
    47     if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate')
     51    if (empty($page['errors']))
    4852    {
    49       $template->delete_compiled_templates();
     53      if ($_GET['action'] == 'activate' or $_GET['action'] == 'deactivate')
     54      {
     55        $template->delete_compiled_templates();
     56      }
     57      redirect($base_url);
    5058    }
    51     redirect($base_url);
    5259  }
    5360}
Note: See TracChangeset for help on using the changeset viewer.