Index: modules/blog/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog/blog.module,v retrieving revision 1.296 diff -u -p -r1.296 blog.module --- modules/blog/blog.module 28 Dec 2007 12:02:51 -0000 1.296 +++ modules/blog/blog.module 4 Jan 2008 21:14:15 -0000 @@ -23,7 +23,7 @@ function blog_node_info() { * Implementation of hook_perm(). */ function blog_perm() { - return array('edit own blog'); + return array('edit own blog', 'delete own blog entries'); } /** @@ -34,11 +34,17 @@ function blog_access($op, $node, $accoun return user_access('edit own blog', $account) && $account->uid; } - if ($op == 'update' || $op == 'delete') { + if ($op == 'update') { if (user_access('edit own blog', $account) && ($node->uid == $account->uid)) { return TRUE; } } + + if ($op == 'delete') { + if (user_access('delete own blog entries', $account) && ($node->uid == $account->uid)) { + return TRUE; + } + } } /** Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.441 diff -u -p -r1.441 forum.module --- modules/forum/forum.module 1 Jan 2008 18:23:14 -0000 1.441 +++ modules/forum/forum.module 4 Jan 2008 21:14:21 -0000 @@ -309,18 +309,24 @@ function forum_access($op, $node, $accou return user_access('create forum topics', $account); } - if ($op == 'update' || $op == 'delete') { + if ($op == 'update') { if (user_access('edit any forum topic', $account) || (user_access('edit own forum topics', $account) && ($account->uid == $node->uid))) { return TRUE; } } + + if ($op == 'delete') { + if (user_access('delete any forum topic', $account) || (user_access('delete own forum topics', $account) && ($account->uid == $node->uid))) { + return TRUE; + } + } } /** * Implementation of hook_perm(). */ function forum_perm() { - return array('create forum topics', 'edit own forum topics', 'edit any forum topic', 'administer forums'); + return array('create forum topics', 'delete own forum topics', 'delete any forum topic', 'edit own forum topics', 'edit any forum topic', 'administer forums'); } /**