#186546 by bjaspan: fix missing forum vocabulary when people turned on forum module, but never visited any pages in Drupal 5 and they upgrade to Drupal 6 which does this much better

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index 674077dea..3546b4f66 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -161,8 +161,15 @@ function forum_init() {
  * Implementation of hook_nodeapi().
  */
 function forum_nodeapi(&$node, $op, $teaser, $page) {
+  // We are going to return if $node->type is not one of the node
+  // types assigned to the forum vocabulary.  If forum_nav_vocabulary
+  // is undefined or the vocabulary does not exist, it clearly cannot
+  // be assigned to $node->type, so return to avoid E_ALL warnings.
   $vid = variable_get('forum_nav_vocabulary', '');
   $vocabulary = taxonomy_vocabulary_load($vid);
+  if (empty($vocabulary)) {
+    return;
+  }
 
   // Operate only on node types assigned for the forum vocabulary.
   if (!in_array($node->type, $vocabulary->nodes)) {