- Patch #30984 by webchick, keith.smith, kkaefer, Crell et al: provide descriptions for permissions on the permission administration page.

1 files changed, 8 insertions, 4 deletions

diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a58c62f33..29c97ca7b 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -307,11 +307,11 @@ function forum_node_info() {
 function forum_access($op, $node, $account) {
   switch ($op) {
     case 'create':
-      return user_access('create forum topics', $account);
+      return user_access('create forum content', $account);
     case 'update':
-      return user_access('edit any forum topic', $account) || (user_access('edit own forum topics', $account) && ($account->uid == $node->uid));
+      return user_access('edit any forum content', $account) || (user_access('edit own forum content', $account) && ($account->uid == $node->uid));
     case 'delete':
-      return user_access('delete any forum topic', $account) || (user_access('delete own forum topics', $account) && ($account->uid == $node->uid));
+      return user_access('delete any forum content', $account) || (user_access('delete own forum content', $account) && ($account->uid == $node->uid));
   }
 }
 
@@ -319,7 +319,11 @@ function forum_access($op, $node, $account) {
  * Implementation of hook_perm().
  */
 function forum_perm() {
-  return array('create forum topics', 'delete own forum topics', 'delete any forum topic', 'edit own forum topics', 'edit any forum topic', 'administer forums');
+  $perms = array(
+    'administer forums' => t('Manage forums and configure forum administration settings.'),
+  );
+  $perms += node_list_permissions('forum');
+  return $perms;
 }
 
 /**