summaryrefslogtreecommitdiff
path: root/modules/forum/forum.module
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2008-01-01 17:46:30 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2008-01-01 17:46:30 +0000
commit195fe364d26890f98c5a04510cf6906b7d85263d (patch)
treefd87d6204d680eed235509ec5bd33874862693ef /modules/forum/forum.module
parent84c6d225e8f3579fe7f9e128cf7a21453dee66c0 (diff)
downloadbrdo-195fe364d26890f98c5a04510cf6906b7d85263d.tar.gz
brdo-195fe364d26890f98c5a04510cf6906b7d85263d.tar.bz2
#203582 by David_Rothstein: some core hook_access() implementations are not using the passed in account
Diffstat (limited to 'modules/forum/forum.module')
-rw-r--r--modules/forum/forum.module5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 8fc78fbf8..a9b817a09 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -310,10 +310,7 @@ function forum_access($op, $node, $account) {
}
if ($op == 'update' || $op == 'delete') {
- if (user_access('edit own forum topics', $account) && ($account->uid == $node->uid)) {
- return TRUE;
- }
- if (user_access('edit any forum topic')) {
+ if (user_access('edit any forum topic', $account) || (user_access('edit own forum topics', $account) && ($account->uid == $node->uid))) {
return TRUE;
}
}