From 22f49d0202b236e5c63a8875764076938f020de3 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Tue, 10 May 2011 13:27:07 -0500 Subject: Patch #1153072: Admin role doesn't provide all permissions. --- modules/user/user.module | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/user/user.module b/modules/user/user.module index 0c437ad..69273eb 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -3758,21 +3758,13 @@ function user_register_submit($form, &$form_state) { } /** - * Implements hook_modules_installed(). + * Implements hook_flush_caches(). */ -function user_modules_installed($modules) { +function user_flush_caches() { // Assign all available permissions to the administrator role. - $rid = variable_get('user_admin_role', 0); - if ($rid) { - $permissions = array(); - foreach ($modules as $module) { - if ($module_permissions = module_invoke($module, 'permission')) { - $permissions = array_merge($permissions, array_keys($module_permissions)); - } - } - if (!empty($permissions)) { - user_role_grant_permissions($rid, $permissions); - } + if ($rid = variable_get('user_admin_role', 0)) { + $permissions = module_invoke_all('permission'); + user_role_grant_permissions($rid, $permissions); } } -- 1.7.4.2