Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #619904 by nenne: fixed forum.module doesn't uninstall cleanly.

merge-requests/26/head
Dries Buytaert 2009-12-10 15:52:56 +00:00
parent c2f26d3368
commit 318436d199
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/forum/forum.install
View File

@ -21,11 +21,14 @@ function forum_install() {
} }
function forum_enable() { function forum_enable() {
// Get info on the field "taxonomy_forums".
$field_check = field_info_field("taxonomy_forums");
if ($vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', 0))) { if ($vocabulary = taxonomy_vocabulary_load(variable_get('forum_nav_vocabulary', 0))) {
// Save the vocabulary to create the default field instance. // Save the vocabulary to create the default field instance.
taxonomy_vocabulary_save($vocabulary); taxonomy_vocabulary_save($vocabulary);
} }
else { // Create fields if info on "taxonomy_forums" field turns out empty.
elseif (empty($field_check)) {
// Create the forum vocabulary if it does not exist. Assign the vocabulary // 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 // a low weight so it will appear first in forum topic create and edit
// forms. // forms.
@ -63,12 +66,7 @@ function forum_uninstall() {
// Load the dependent Taxonomy module, in case it has been disabled. // Load the dependent Taxonomy module, in case it has been disabled.
drupal_load('module', 'taxonomy'); drupal_load('module', 'taxonomy');
// Delete the vocabulary.
$vid = variable_get('forum_nav_vocabulary', 0);
taxonomy_vocabulary_delete($vid);
variable_del('forum_containers'); variable_del('forum_containers');
variable_del('forum_nav_vocabulary');
variable_del('forum_hot_topic'); variable_del('forum_hot_topic');
variable_del('forum_per_page'); variable_del('forum_per_page');
variable_del('forum_order'); variable_del('forum_order');