Index: openacs-4/packages/contacts/lib/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/merge.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/merge.tcl	17 May 2006 07:41:43 -0000	1.1
+++ openacs-4/packages/contacts/lib/merge.tcl	17 May 2006 07:51:19 -0000	1.2
@@ -246,8 +246,16 @@
 	    }
 	}
 
-	error "we need to deal with application_data_links"
+	# Application data links
+	set party_links [application_data_link::get -object_id $party_id]
+	foreach linked_object_id [application_data_link::get -object_id $merge_party_id] {
+	    if { [lsearch $party_links $linked_object_id] < 0 } {
+		application_data_link::new -this_object_id $party_id -target_object_id $linked_object_id
+	    }
+	}
+	application_data_link::delete_links -object_id $merge_party_id
 
+
 	# first we delete the contact_party_revisions
 	db_dml update_it { update cr_items set live_revision = NULL, latest_revision = NULL where item_id = :merge_party_id }
 	db_list do_it { select content_revision__delete(revision_id) from cr_revisions where item_id = :merge_party_id }