2 files changed, 20 insertions, 1 deletions
diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc
index ce1618fca..c758ef442 100644
--- a/modules/forum/forum.admin.inc
+++ b/modules/forum/forum.admin.inc
@@ -173,7 +173,7 @@ function forum_confirm_delete(&$form_state, $tid) {
  * Implementation of forms api _submit call. Deletes a forum after confirmation.
  */
 function forum_confirm_delete_submit($form, &$form_state) {
-  taxonomy_del_term($form_state['values']['tid']);
+  taxonomy_term_delete($form_state['values']['tid']);
   drupal_set_message(t('The forum %term and all sub-forums have been deleted.', array('%term' => $form_state['values']['name'])));
   watchdog('content', 'forum: deleted %term and all its sub-forums.', array('%term' => $form_state['values']['name']));
 
diff --git a/modules/forum/forum.test b/modules/forum/forum.test
index b8e9136c0..95f0ccbfe 100644
--- a/modules/forum/forum.test
+++ b/modules/forum/forum.test
@@ -103,6 +103,10 @@ class ForumTestCase extends DrupalWebTestCase {
     $this->container = $this->createForum('container');
     // Create forum inside the forum container.
     $this->forum = $this->createForum('forum', $this->container['tid']);
+    // Create second forum in container.
+    $this->delete_forum = $this->createForum('forum', $this->container['tid']);
+    // Delete this second form.
+    $this->deleteForum($this->delete_forum['tid']);
     // Create forum at the top (root) level.
     $this->root_forum = $this->createForum('forum');
   }
@@ -182,6 +186,21 @@ class ForumTestCase extends DrupalWebTestCase {
   }
 
   /**
+   * Delete a forum.
+   *
+   * @param integer $tid Forum id.
+   */
+  function deleteForum($tid) {
+    // Delete the forum id.
+    $this->drupalPost('admin/build/forum/edit/forum/'. $tid, array(), t('Delete'));
+    $this->drupalPost(NULL, NULL, t('Delete'));
+    
+    // Assert that the forum no longer exists.
+    $this->drupalGet('forum/'. $tid);
+    $this->assertRaw(t('No forums defined'), 'The forum was not found');
+  }
+
+  /**
    * Run basic tests on the indicated user.
    *
    * @param object $user The logged in user.