From 8a1781ea223c7db4fb00ce98aa8f4e8322a9131c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 20 Jul 2012 18:48:28 +0000 Subject: [PATCH 1/2] See ChangeLog Monotone-Parent: 5a6d160e6f9616edb725a40e08f24f0f0bf539b0 Monotone-Revision: c9c54e20cc8e010c29ef8e5fa1cbd039c35e5344 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-07-20T18:48:28 --- ChangeLog | 3 +++ UI/WebServerResources/MailerUI.js | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1907ca606..84e07e25c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-07-20 Francis Lachapelle + * UI/WebServerResources/MailerUI.js (onEmailTo): append the email + address from the href attribute if it doesn't appear in the link content. + * UI/MailPartViewers/UIxMailPartHTMLViewer.m (-startElement:namespace:rawName:attributes:): don't skip "mailto:" href. diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index 3422fee67..25af280f4 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -1790,7 +1790,11 @@ function newContactFromEmail(event) { } function onEmailTo(event) { - openMailTo(this.innerHTML.strip()); + var s = this.innerHTML.strip(); + if (!/@/.test(s)) { + s += ' <' + this.href.substr(7) + '>'; + } + openMailTo(s); Event.stop(event); return false; } From 8f31821e1d21a1ba12aca2eb3f081b8b9a72c338 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 20 Jul 2012 19:07:03 +0000 Subject: [PATCH 2/2] Monotone-Parent: c9c54e20cc8e010c29ef8e5fa1cbd039c35e5344 Monotone-Revision: 7eb19f1f060daa6cb0a2421481ec351910c3af68 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-20T19:07:03 --- ChangeLog | 7 +++++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 84e07e25c..3ae8b8e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-07-20 Wolfgang Sourdeau + + * SoObjects/Appointments/SOGoAppointmentFolder.m + (_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:withTimeZone:toArray:): + return immediately if the occurrence does not have a valid + recurrence-id. + 2012-07-20 Francis Lachapelle * UI/WebServerResources/MailerUI.js (onEmailTo): append the email diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 29a64b77b..50cdd92f9 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -863,6 +863,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir newRecord = nil; recurrenceId = [component recurrenceId]; + if (!recurrenceId) + { + [self errorWithFormat: @"ignored component with an empty EXCEPTION-ID"]; + return; + } if (tz) {