diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | modules/user/user.admin.inc | 6 | ||||
| -rw-r--r-- | profiles/default/default.profile | 16 |
3 files changed, 11 insertions, 13 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 452349a96..9c59fa4c2 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -29,6 +29,8 @@ Drupal 7.0, xxxx-xx-xx (development version) order can now be customised using the Views module. * Added additional features to the default install profile, and implemented a "slimmed down" install profile designed for developers. + * Added an administrator role which is assigned all permisions for + installed modules automatically. * Image toolkits are now provided by modules (rather than requiring a manual file copy to the includes directory). * Added an edit tab to taxonomy term pages. diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 303d2ff0a..f5f6117f4 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -254,10 +254,10 @@ function user_admin_settings() { // Administrative role option. $form['admin_role'] = array( '#type' => 'fieldset', - '#title' => t ('Administrator role'), + '#title' => t('Administrator role'), ); - // Don't allow users to set the anonymous or authenticated user roles as the + // Do not allow users to set the anonymous or authenticated user roles as the // administrator role. $roles = user_roles(); $roles = array_slice($roles, 2, NULL, TRUE); @@ -944,7 +944,7 @@ function user_modules_installed($modules) { db_insert('role_permission') ->fields(array( 'rid' => $rid, - 'permission' => $permission, + 'permission' => $permission, ))->execute(); } } diff --git a/profiles/default/default.profile b/profiles/default/default.profile index d75e878c4..2bab8f835 100644 --- a/profiles/default/default.profile +++ b/profiles/default/default.profile @@ -221,16 +221,12 @@ function default_profile_tasks(&$task, $url) { variable_set('user_admin_role', $rid); // Assign all available permissions to this role. - foreach (module_implements('perm') as $module) { - if ($permissions = module_invoke($module, 'perm')) { - foreach (array_keys($permissions) as $permission) { - db_insert('role_permission') - ->fields(array( - 'rid' => $rid, - 'permission' => $permission, - ))->execute(); - } - } + foreach (module_invoke_all('perm') as $key => $value) { + db_insert('role_permission') + ->fields(array( + 'rid' => $rid, + 'permission' => $key, + ))->execute(); } // Update the menu router information. |