From d64b5bdc478ac4799d0ea34268a7dbe4f97055dc Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 12 May 2005 16:57:15 +0000 Subject: [PATCH] * src/ReportUtils.py (insert_images): Pass sizes to add_media_object; (married_str): Quit if no spouse. svn: r4573 --- gramps2/ChangeLog | 3 ++- gramps2/src/ReportUtils.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index ebe76c252..3c64b1138 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -7,7 +7,8 @@ * src/plugins/Check.py (cleanup_missing_photos): Typo. * configure.in: Bump up the version number. * NEWS: Update. - * src/ReportUtils.py (insert_images): Pass sizes to add_media_object. + * src/ReportUtils.py (insert_images): Pass sizes to add_media_object; + (married_str): Quit if no spouse. 2005-05-12 Martin Hawlisch * src/plugins/TestcaseGenerator.py: Added generation of multiple date diff --git a/gramps2/src/ReportUtils.py b/gramps2/src/ReportUtils.py index 3e2c68e86..f2777b12b 100644 --- a/gramps2/src/ReportUtils.py +++ b/gramps2/src/ReportUtils.py @@ -795,6 +795,10 @@ def married_str(database,person,spouse,event,endnotes=None, @rtype: unicode """ + # not all families have a spouse. + if not spouse: + return u"" + if not endnotes: endnotes = empty_notes