? 306151-schema-based-install.patch
? 423690-menu-link-maintain.patch
? 457450-menu-objects-ext.patch
? 457450-menu-objects.patch
? 506976_0.patch
? 510740-admin-user-permissions.patch
? test.patch
? sites/all/modules/admin_menu
? sites/all/modules/coder
? sites/all/modules/devel
? sites/all/modules/devel 2
? sites/all/modules/devel-7.x-1.x-dev.tar.gz
? sites/default/files
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.60
diff -u -p -r1.60 user.admin.inc
--- modules/user/user.admin.inc	1 Jul 2009 08:39:56 -0000	1.60
+++ modules/user/user.admin.inc	5 Jul 2009 16:12:35 -0000
@@ -585,10 +585,10 @@ function user_admin_settings() {
  * Menu callback: administer permissions.
  *
  * @ingroup forms
- * @see user_admin_perm_submit()
- * @see theme_user_admin_perm()
+ * @see user_admin_permissions_submit()
+ * @see theme_user_admin_permissions()
  */
-function user_admin_perm($form_state, $rid = NULL) {
+function user_admin_permissions($form_state, $rid = NULL) {
 
   // Retrieve role names for columns.
   $role_names = user_roles();
@@ -645,9 +645,9 @@ function user_admin_perm($form_state, $r
 /**
  * Save permissions selected on the administer permissions page.
  *
- * @see user_admin_perm
+ * @see user_admin_permissions()
  */
-function user_admin_perm_submit($form, &$form_state) {
+function user_admin_permissions_submit($form, &$form_state) {
   foreach ($form_state['values']['role_names'] as $rid => $name) {
     $checked = array_filter($form_state['values'][$rid]);
     // Delete existing permissions for the role. This handles "unchecking" checkboxes.
@@ -675,7 +675,7 @@ function user_admin_perm_submit($form, &
  *
  * @ingroup themeable
  */
-function theme_user_admin_perm($form) {
+function theme_user_admin_permissions($form) {
   $roles = user_roles();
   foreach (element_children($form['permission']) as $key) {
     $row = array();
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1006
diff -u -p -r1.1006 user.module
--- modules/user/user.module	2 Jul 2009 15:07:37 -0000	1.1006
+++ modules/user/user.module	5 Jul 2009 16:12:39 -0000
@@ -57,7 +57,7 @@ function user_theme() {
     'user_list' => array(
       'arguments' => array('users' => NULL, 'title' => NULL),
     ),
-    'user_admin_perm' => array(
+    'user_admin_permissions' => array(
       'arguments' => array('form' => NULL),
       'file' => 'user.admin.inc',
     ),
@@ -1334,7 +1334,7 @@ function user_menu() {
     'title' => 'Permissions',
     'description' => 'Determine access to features by selecting permissions for roles.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('user_admin_perm'),
+    'page arguments' => array('user_admin_permissions'),
     'access arguments' => array('administer permissions'),
   );
   $items['admin/user/roles'] = array(