From 3c3eb510a05bd4b3e2afe325a8ac05957c00b897 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 23 Feb 2011 20:51:15 +0000 Subject: [PATCH] See Changelog Monotone-Parent: 5950d93fbbb7ef6a3132a3c725a153f854b3e983 Monotone-Revision: 93bde4643a2fb0ad0e86c36a29a73bc23ad39c64 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-02-23T20:51:15 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Mailer/SOGoMailObject.m | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f82c0b8bb..de28d39b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-02-23 Francis Lachapelle + * SoObjects/Mailer/SOGoMailObject.m (-lookupInfoForBodyPart:): we + now compare the path with a string only if it is a string (and not + an array). + * SoObjects/Appointments/SOGoAppointmentFolder.m (-fixupCycleRecord:cycleRange:firstInstanceCalendarDateRange:withEventTimeZone:): avoid fixing the timezone if no event timezone is defined. diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m index 9d1cd3d53..7db3d8d69 100644 --- a/SoObjects/Mailer/SOGoMailObject.m +++ b/SoObjects/Mailer/SOGoMailObject.m @@ -349,14 +349,10 @@ static BOOL debugSoParts = NO; return nil; } - if ([_path isEqualToString: @"text"]) { - return info; - } - /* ensure array argument */ if ([_path isKindOfClass:[NSString class]]) { - if ([_path length] == 0) + if ([_path length] == 0 || [_path isEqualToString: @"text"]) return info; _path = [_path componentsSeparatedByString: @"."];