From 01188d7bf92b49147d85fdf2ce7c4670f60e848b Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Fri, 22 Dec 2006 18:56:38 +0000 Subject: [PATCH] 2006-12-22 Don Allingham * src/Merge/_MergePerson.py (MergePeople.merge_person_information): copy the LDS information svn: r7836 --- gramps2/ChangeLog | 5 +++++ gramps2/src/Merge/_MergePerson.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 36b6f1024..34af8a692 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,8 @@ +2006-12-22 Don Allingham + + * src/Merge/_MergePerson.py (MergePeople.merge_person_information): + copy the LDS information + 2006-12-21 Don Allingham * src/GrampsDb/_GrampsXMLDB.py: fix bookmarks * TODO: update diff --git a/gramps2/src/Merge/_MergePerson.py b/gramps2/src/Merge/_MergePerson.py index 243d83a3e..8c3c62ff4 100644 --- a/gramps2/src/Merge/_MergePerson.py +++ b/gramps2/src/Merge/_MergePerson.py @@ -441,6 +441,9 @@ class MergePeople: # copy urls new.set_url_list(self.p1.get_url_list() + self.p2.get_url_list()) + # merge LDS + new.set_lds_ord_list(self.p1.get_lds_ord_list() + self.p2.get_lds_ord_list()) + # privacy new.set_privacy(self.p1.get_privacy() or self.p2.get_privacy())