Index: taxonomy_manager.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_manager/Attic/taxonomy_manager.admin.inc,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 taxonomy_manager.admin.inc
--- taxonomy_manager.admin.inc	30 Jul 2008 06:59:55 -0000	1.1.2.6
+++ taxonomy_manager.admin.inc	20 Aug 2008 00:37:37 -0000
@@ -1132,13 +1132,13 @@ function taxonomy_manager_merge($main_te
   foreach ($merging_terms as $merge_term) {
     if ($merge_term != $main_term) {
       //update node-relations
-      $sql = db_query("SELECT nid FROM {term_node} WHERE tid = %d", $merge_term);
+      $sql = db_query("SELECT * FROM {term_node} WHERE tid = %d", $merge_term);
       while ($obj = db_fetch_object($sql)) {
-        $nid = $obj->nid;
-        db_query("DELETE FROM {term_node} WHERE tid = %d AND nid = %d", $merge_term, $nid);
-        if (!db_result(db_query("SELECT COUNT(*) FROM {term_node} WHERE tid = %d AND nid = %d", $main_term, $nid))) {
-          db_query("INSERT INTO {term_node} (tid, nid) VALUES (%d, %d)", $main_term, $nid);
-       }
+        db_query("DELETE FROM {term_node} WHERE tid = %d AND nid = %d", $obj->tid, $obj->nid);
+        if (!db_result(db_query("SELECT COUNT(*) FROM {term_node} WHERE tid = %d AND nid = %d", $main_term, $obj->nid))) {
+          $obj->tid = $main_term;
+          drupal_write_record('term_node', $obj);
+        }
       }
     
       if ($voc->hierarchy == 1) {  //sinlge hierarchy