From c8302d626540edc433a30f1a0f70270371307e68 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 17 Sep 2011 07:27:18 -0400
Subject: [PATCH] - Patch #646312 by mr.baileys: remove ->module.

---
 modules/simpletest/tests/path.test  |  2 +-
 modules/taxonomy/taxonomy.admin.inc |  1 -
 modules/taxonomy/taxonomy.install   | 14 +++++++-------
 modules/taxonomy/taxonomy.module    |  4 ----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/modules/simpletest/tests/path.test b/modules/simpletest/tests/path.test
index 4701b5659b1..e1b320d270d 100644
--- a/modules/simpletest/tests/path.test
+++ b/modules/simpletest/tests/path.test
@@ -180,7 +180,7 @@ class UrlAlterFunctionalTest extends DrupalWebTestCase {
     // level and for a specific existing forum.
     $this->assertUrlInboundAlter('community', 'forum');
     $this->assertUrlOutboundAlter('forum', 'community');
-    $forum_vid = db_query("SELECT vid FROM {taxonomy_vocabulary} WHERE module = 'forum'")->fetchField();
+    $forum_vid = variable_get('forum_nav_vocabulary');
     $tid = db_insert('taxonomy_term_data')
       ->fields(array(
         'name' => $this->randomName(),
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index a236cfed1d8..2440a283d8b 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -173,7 +173,6 @@ function taxonomy_form_vocabulary($form, &$form_state, $edit = array()) {
   if (isset($vocabulary->vid)) {
     $form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
     $form['vid'] = array('#type' => 'value', '#value' => $vocabulary->vid);
-    $form['module'] = array('#type' => 'value', '#value' => $vocabulary->module);
   }
   $form['#validate'][] = 'taxonomy_form_vocabulary_validate';
 
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index b67f18b5895..3e07259f411 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -150,13 +150,6 @@ function taxonomy_schema() {
         'size' => 'tiny',
         'description' => 'The type of hierarchy allowed within the vocabulary. (0 = disabled, 1 = single, 2 = multiple)',
       ),
-      'module' => array(
-        'type' => 'varchar',
-        'length' => 255,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => 'The module which created the vocabulary.',
-      ),
       'weight' => array(
         'type' => 'int',
         'not null' => TRUE,
@@ -246,3 +239,10 @@ function taxonomy_field_schema($field) {
     ),
   );
 }
+
+/**
+ * Remove the {taxonomy_vocabulary}.module field.
+ */
+function taxonomy_update_8000() {
+  db_drop_field('taxonomy_vocabulary', 'module');
+}
\ No newline at end of file
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index eb81870f998..d7a5e9a1ffb 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -417,10 +417,6 @@ function taxonomy_vocabulary_save($vocabulary) {
     $vocabulary->old_machine_name = $vocabulary->original->machine_name;
   }
 
-  if (!isset($vocabulary->module)) {
-    $vocabulary->module = 'taxonomy';
-  }
-
   module_invoke_all('taxonomy_vocabulary_presave', $vocabulary);
   module_invoke_all('entity_presave', $vocabulary, 'taxonomy_vocabulary');