summaryrefslogtreecommitdiff
path: root/modules/forum/forum.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-15 12:44:36 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-15 12:44:36 +0000
commit714597a9cdb42c3ca0df843f7f6a7351c6e06e39 (patch)
tree4e42239768111673ec7e8ae3181e7fa7339937c4 /modules/forum/forum.module
parent35e21e54e1122f98bede28f89d80f2fb13b3fd97 (diff)
downloadbrdo-714597a9cdb42c3ca0df843f7f6a7351c6e06e39.tar.gz
brdo-714597a9cdb42c3ca0df843f7f6a7351c6e06e39.tar.bz2
- Patch #470242 by yched, bjaspan: fixed namespacing for bundle names to avoid users rendering their site unusable.
Diffstat (limited to 'modules/forum/forum.module')
-rw-r--r--modules/forum/forum.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 6a62bdfe8..da83c86f6 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -159,7 +159,7 @@ function forum_init() {
*/
function _forum_node_check_node_type($node) {
// Fetch information about the forum field.
- $field = field_info_instance('taxonomy_forums', $node->type);
+ $field = field_info_instance('node', 'taxonomy_forums', $node->type);
return is_array($field);
}
@@ -850,7 +850,7 @@ function template_preprocess_forums(&$variables) {
// Loop through all bundles for forum taxonomy vocabulary field.
$field = field_info_field('taxonomy_' . $vocabulary->machine_name);
- foreach ($field['bundles'] as $type) {
+ foreach ($field['bundles']['node'] as $type) {
// Check if the current user has the 'create' permission for this node type.
if (node_access('create', $type)) {
// Fetch the "General" name of the content type;