? .DS_Store
? die__taxonomy_term_select_die_00.patch
? die__taxonomy_term_select_die_01.patch
? die__taxonomy_term_select_die_02.patch
? dont_require_perm_descriptions_00.patch
? taxonomy_widgets_04.patch
? sites/.DS_Store
? sites/default/.DS_Store
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.84
diff -u -p -r1.84 user.admin.inc
--- modules/user/user.admin.inc	10 Oct 2009 16:48:39 -0000	1.84
+++ modules/user/user.admin.inc	14 Oct 2009 17:58:26 -0000
@@ -637,7 +637,7 @@ function user_admin_permissions($form, $
         $form['permission'][$perm] = array(
           '#type' => 'item',
           '#markup' => $perm_item['title'],
-          '#description' => $hide_descriptions ? $perm_item['description'] : NULL,
+          '#description' => $hide_descriptions && isset($perm_item['description']) ? $perm_item['description'] : NULL,
         );
         foreach ($role_names as $rid => $name) {
           // Builds arrays for checked boxes for each role