diff --git a/admin_menu.api.php b/admin_menu.api.php index 2d212fb..121ba23 100644 --- a/admin_menu.api.php +++ b/admin_menu.api.php @@ -92,7 +92,7 @@ function hook_admin_menu_output_build(&$content) { if (isset($content['icon'])) { $content['icon']['myitem']['cron'] = array( '#title' => t('Run cron'), - '#access' => user_access('administer site configuration'), + '#access' => Drupal::currentUser()->hasPermission('administer site configuration'), '#href' => 'admin/reports/status/run-cron', ); } diff --git a/admin_menu.inc b/admin_menu.inc index faebfb3..679733f 100644 --- a/admin_menu.inc +++ b/admin_menu.inc @@ -440,7 +440,7 @@ function admin_menu_links_icon() { $links['icon']['cron'] = array( '#title' => t('Run cron'), '#weight' => 50, - '#access' => user_access('administer site configuration'), + '#access' => Drupal::currentUser()->hasPermission('administer site configuration'), '#href' => 'admin/reports/status/run-cron', '#options' => array( 'query' => $destination, @@ -451,7 +451,7 @@ function admin_menu_links_icon() { '#title' => t('Run updates'), '#weight' => 50, // @see update_access_allowed() - '#access' => $GLOBALS['user']->uid == 1 || !empty($GLOBALS['update_free_access']) || user_access('administer software updates'), + '#access' => $GLOBALS['user']->uid == 1 || !empty($GLOBALS['update_free_access']) || Drupal::currentUser()->hasPermission('administer software updates'), '#href' => base_path() . 'update.php', '#options' => array( 'external' => TRUE, @@ -461,7 +461,7 @@ function admin_menu_links_icon() { $links['icon']['drupal.org'] = array( '#title' => 'Drupal.org', '#weight' => 100, - '#access' => user_access('display drupal links'), + '#access' => Drupal::currentUser()->hasPermission('display drupal links'), '#href' => 'http://drupal.org', ); // Add links to project issue queues. @@ -483,7 +483,7 @@ function admin_menu_links_icon() { $links['icon']['flush-cache'] = array( '#title' => t('Flush all caches'), '#weight' => 20, - '#access' => user_access('flush caches'), + '#access' => Drupal::currentUser()->hasPermission('flush caches'), '#href' => 'admin_menu/flush-cache', '#options' => array( 'query' => $destination + array('token' => drupal_get_token('admin_menu/flush-cache')), @@ -575,7 +575,7 @@ function admin_menu_links_users() { '#description' => t('Current anonymous / authenticated users'), '#weight' => -90, '#attributes' => array('class' => array('admin-menu-action', 'admin-menu-users')), - '#href' => (user_access('administer users') ? 'admin/people/people' : 'user'), + '#href' => (Drupal::currentUser()->hasPermission('administer users') ? 'admin/people/people' : 'user'), ); return $links; } diff --git a/admin_menu.map.inc b/admin_menu.map.inc index 68b9bb4..a9cb1be 100644 --- a/admin_menu.map.inc +++ b/admin_menu.map.inc @@ -12,7 +12,7 @@ * it creates, so that this definition takes effect. */ function node_admin_menu_map() { - if (user_access('administer content types')) { + if (Drupal::currentUser()->hasPermission('administer content types')) { $map['admin/structure/types/manage/%node_type'] = array( 'parent' => 'admin/structure/types', 'arguments' => array( @@ -114,7 +114,7 @@ function field_ui_admin_menu_map() { continue; } // @see field_ui_permission() - if (user_access('administer ' . $entity_type . ' fields')) { + if (Drupal::currentUser()->hasPermission('administer ' . $entity_type . ' fields')) { $fields = array(); foreach (field_info_instances($entity_type, $bundle_name) as $field) { $fields[] = $field['field_name']; diff --git a/admin_menu.module b/admin_menu.module index 02c98f6..699c20c 100644 --- a/admin_menu.module +++ b/admin_menu.module @@ -146,7 +146,7 @@ function admin_menu_system_info_alter(&$info, $file, $type) { * Implements hook_page_bottom(). */ function admin_menu_page_bottom(array &$page_bottom) { - if (!user_access('access administration menu') || admin_menu_suppress(FALSE)) { + if (!Drupal::currentUser()->hasPermission('access administration menu') || admin_menu_suppress(FALSE)) { return; } // Performance: Skip this entirely for AJAX requests.