Commit c8302d62 authored by Dries's avatar Dries
Browse files

- Patch #646312 by mr.baileys: remove ->module.

parent 996b5aca
......@@ -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(),
......
......@@ -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';
......
......@@ -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
......@@ -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');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment