diff options
| author | webchick <webchick@24967.no-reply.drupal.org> | 2011-04-24 01:28:19 -0700 |
|---|---|---|
| committer | webchick <webchick@24967.no-reply.drupal.org> | 2011-04-24 01:28:19 -0700 |
| commit | 4d3217b4db094d4808fe8b0c3caea6e3b10dd575 (patch) | |
| tree | 9932339a9c1e0e2b91349b96fa76c502a9cc4ad9 /modules/forum/forum.module | |
| parent | 86c5f34ccca03ff76d996c103d3991885f277b90 (diff) | |
| download | brdo-4d3217b4db094d4808fe8b0c3caea6e3b10dd575.tar.gz brdo-4d3217b4db094d4808fe8b0c3caea6e3b10dd575.tar.bz2 | |
Issue #1003308 by bfroehle: Fix upgrade path for Forum module by hard-coding vocabulary machine name (with tests).
Diffstat (limited to 'modules/forum/forum.module')
| -rw-r--r-- | modules/forum/forum.module | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 273b3e7a0..c58b5c905 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -169,12 +169,9 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) { $tid = (isset($router_item['page_arguments'][0]) ? $router_item['page_arguments'][0]->tid : 0); $forum_term = forum_forum_load($tid); if ($forum_term) { - $vid = variable_get('forum_nav_vocabulary', 0); - $vocabulary = taxonomy_vocabulary_load($vid); - $links = array(); // Loop through all bundles for forum taxonomy vocabulary field. - $field = field_info_field('taxonomy_' . $vocabulary->machine_name); + $field = field_info_field('taxonomy_forums'); foreach ($field['bundles']['node'] as $type) { if (node_access('create', $type)) { $links[$type] = array( |