From bd937a1842d67dcc1157bb556f73e42e6bb43750 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Sun, 23 May 2010 04:06:16 +0000 Subject: [PATCH] Bug#4001; Text in WebCal of birthday and anniversaries were being doubled up. Thanks Doug S. Blank for the patch. svn: r15449 --- src/plugins/webreport/WebCal.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/webreport/WebCal.py b/src/plugins/webreport/WebCal.py index 426e1ec42..5d848e67b 100644 --- a/src/plugins/webreport/WebCal.py +++ b/src/plugins/webreport/WebCal.py @@ -1155,9 +1155,9 @@ class WebCalReport(Report): # add link to NarrativeWeb if self.link_to_narweb: - text = Html("a", short_name, + text = str(Html("a", short_name, href = self.build_url_fname_html(person.handle, "ppl", - prefix = self.narweb_prefix)) + prefix = self.narweb_prefix))) else: text = short_name self.add_day_item(text, year, month, day, 'Birthday') @@ -1191,12 +1191,12 @@ class WebCalReport(Report): prob_alive_date = Date(this_year, month, day) if self.link_to_narweb: - spouse_name = Html("a", spouse_name, + spouse_name = str(Html("a", spouse_name, href = self.build_url_fname_html(spouse_handle, 'ppl', - prefix = self.narweb_prefix)) - short_name = Html("a", short_name, + prefix = self.narweb_prefix))) + short_name = str(Html("a", short_name, href = self.build_url_fname_html(person.handle, 'ppl', - prefix = self.narweb_prefix)) + prefix = self.narweb_prefix))) alive1 = probably_alive(person, db, prob_alive_date) alive2 = probably_alive(spouse, db, prob_alive_date)