Issue #787652 by andypost, larowlan, joachim: Fixed Forum vocabulary alterations possibly obsolete -- possible to delete forum vocab.

core/modules/forum/forum.module

@@ -575,29 +575,37 @@ function forum_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
 }
 
 /**
- * Implements hook_form_alter().
+ * Implements hook_form_FORM_ID_alter() for taxonomy_form_vocabulary().
  */
-function forum_form_alter(&$form, $form_state, $form_id) {
+function forum_form_taxonomy_form_vocabulary_alter(&$form, &$form_state, $form_id) {
   $vid = variable_get('forum_nav_vocabulary', 0);
   if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) {
-    // Hide critical options from forum vocabulary.
-    if ($form_id == 'taxonomy_form_vocabulary') {
     $form['help_forum_vocab'] = array(
       '#markup' => t('This is the designated forum vocabulary. Some of the normal vocabulary options have been removed.'),
       '#weight' => -1,
     );
-      $form['hierarchy'] = array('#type' => 'value', '#value' => 1);
+    // Forum's vocabulary always has single hierarchy. Forums and containers
-      $form['delete']['#access'] = FALSE;
+    // have only one parent or no parent for root items. By default this value
-    }
+    // is 0.
-    // Hide multiple parents select from forum terms.
+    $form['hierarchy']['#value'] = TAXONOMY_HIERARCHY_SINGLE;
-    elseif ($form_id == 'taxonomy_form_term') {
+    // Do not allow to delete forum's vocabulary.
-      $form['advanced']['parent']['#access'] = FALSE;
+    $form['actions']['delete']['#access'] = FALSE;
-    }
   }
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * Implements hook_form_FORM_ID_alter() for taxonomy_form_term().
+ */
+function forum_form_taxonomy_form_term_alter(&$form, &$form_state, $form_id) {
+  $vid = variable_get('forum_nav_vocabulary', 0);
+  if (isset($form['vid']['#value']) && $form['vid']['#value'] == $vid) {
+    // Hide multiple parents select from forum terms.
+    $form['relations']['parent']['#access'] = FALSE;
+  }
+}
+
+/**
+ * Implements hook_form_BASE_FORM_ID_alter() for node_form().
  */
 function forum_form_node_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['taxonomy_forums'])) {

core/modules/forum/forum.test

@@ -246,6 +246,38 @@ class ForumTestCase extends DrupalWebTestCase {
     $this->deleteForum($this->delete_forum['tid']);
     // Create forum at the top (root) level.
     $this->root_forum = $this->createForum('forum');
+
+    // Test vocabulary form alterations.
+    $this->drupalGet('admin/structure/taxonomy/forums/edit');
+    $this->assertFieldByName('op', t('Save'), 'Save button found.');
+    $this->assertNoFieldByName('op', t('Delete'), 'Delete button not found.');
+
+    // Test term edit form alterations.
+    $this->drupalGet('taxonomy/term/' . $this->container['tid'] . '/edit');
+    // Test parent field been hidden by forum module.
+    $this->assertNoField('parent[]', 'Parent field not found.');
+
+    // Create a default vocabulary named "Tags".
+    $description = 'Use tags to group articles on similar topics into categories.';
+    $help = 'Enter a comma-separated list of words to describe your content.';
+    $vocabulary = entity_create('taxonomy_vocabulary', array(
+      'name' => 'Tags',
+      'description' => $description,
+      'machine_name' => 'tags',
+      'langcode' => language_default()->langcode,
+      'help' => $help,
+    ));
+    taxonomy_vocabulary_save($vocabulary);
+    // Test tags vocabulary form is not affected.
+    $this->drupalGet('admin/structure/taxonomy/tags/edit');
+    $this->assertFieldByName('op', t('Save'), 'Save button found.');
+    $this->assertFieldByName('op', t('Delete'), 'Delete button found.');
+    // Test tags vocabulary term form is not affected.
+    $this->drupalGet('admin/structure/taxonomy/tags/add');
+    $this->assertField('parent[]', 'Parent field found.');
+    // Test relations fieldset exists.
+    $relations_fieldset = $this->xpath("//fieldset[@id='edit-relations']");
+    $this->assertTrue(isset($relations_fieldset[0]), 'Relations fieldset element found.');
   }
 
   /**