diff options
Diffstat (limited to 'modules/taxonomy')
-rw-r--r-- | modules/taxonomy/taxonomy.install | 2 | ||||
-rw-r--r-- | modules/taxonomy/taxonomy.module | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install index 9fc2ad23c..618f1c1bd 100644 --- a/modules/taxonomy/taxonomy.install +++ b/modules/taxonomy/taxonomy.install @@ -312,6 +312,6 @@ function taxonomy_update_7001() { db_rename_table($ret, 'term_synonym', 'taxonomy_term_synonym'); db_rename_table($ret, 'vocabulary', 'taxonomy_vocabulary'); db_rename_table($ret, 'vocabulary_node_types', 'taxonomy_vocabulary_node_type'); - + return $ret; } diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 695b45bc1..109397f3c 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -73,7 +73,7 @@ function taxonomy_nodeapi_view($node) { } } } - + $node->content['links']['terms'] = array( '#type' => 'node_links', '#value' => $links, @@ -323,7 +323,7 @@ function taxonomy_term_save($term) { $status = drupal_write_record('taxonomy_term_data', $term); module_invoke_all('taxonomy_term_update', $term); } - + $or = db_or()->condition('tid1', $term->tid)->condition('tid2', $term->tid); db_delete('taxonomy_term_relation')->condition($or)->execute(); |