Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal/drupal/CHANGELOG.txt,v
retrieving revision 1.311
diff -u -p -r1.311 CHANGELOG.txt
--- CHANGELOG.txt	2 Jun 2009 06:24:06 -0000	1.311
+++ CHANGELOG.txt	4 Jun 2009 20:06:17 -0000
@@ -29,6 +29,8 @@ Drupal 7.0, xxxx-xx-xx (development vers
       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.
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.55
diff -u -p -r1.55 user.admin.inc
--- modules/user/user.admin.inc	4 Jun 2009 09:52:33 -0000	1.55
+++ modules/user/user.admin.inc	4 Jun 2009 20:06:22 -0000
@@ -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();
         }
       }
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.45
diff -u -p -r1.45 default.profile
--- profiles/default/default.profile	4 Jun 2009 09:52:33 -0000	1.45
+++ profiles/default/default.profile	4 Jun 2009 20:06:22 -0000
@@ -221,16 +221,12 @@ function default_profile_tasks(&$task, $
   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.