From 4157a521e0899622509022170c2be89da029c291 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= Date: Mon, 31 Dec 2007 16:58:34 +0000 Subject: #199373 report by avskip, patch by myself, testing by keith.smith: forum node type was not re-added to the forum vocabulary when the module is re-enabled (after being disabled) --- modules/forum/forum.install | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'modules/forum/forum.install') diff --git a/modules/forum/forum.install b/modules/forum/forum.install index 62035955f..ff9ac135b 100644 --- a/modules/forum/forum.install +++ b/modules/forum/forum.install @@ -12,12 +12,17 @@ function forum_install() { } function forum_enable() { - // Create the forum vocabulary if it does not exist. Assign the vocabulary - // a low weight so it will appear first in forum topic create and edit - // forms. - $vid = variable_get('forum_nav_vocabulary', 0); - $vocabularies = taxonomy_get_vocabularies(); - if (!isset($vocabularies[$vid])) { + if ($vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', 0))) { + // Existing install. Add back forum node type, if the forums + // vocabulary still exists. Keep all other node types intact there. + $vocabulary = (array) $vocabulary; + $vocabulary['nodes']['forum'] = 1; + taxonomy_save_vocabulary($vocabulary); + } + else { + // Create the forum vocabulary if it does not exist. Assign the vocabulary + // a low weight so it will appear first in forum topic create and edit + // forms. $vocabulary = array( 'name' => t('Forums'), 'multiple' => 0, @@ -123,4 +128,4 @@ function forum_update_6000() { } return $ret; -} \ No newline at end of file +} -- cgit v1.2.3