From 82f15efb6d68d841eaf7d877f82f7fd0d84808d1 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Sat, 26 Dec 2009 19:00:45 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 4b96a79ded99473f7c6766140d0cd061fbf033cf Monotone-Revision: c5aef827213cfa0dd83fa1d18267c116529ec0d7 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2009-12-26T19:00:45 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Mailer/SOGoMailForward.m | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e386e4299..e95eeeeae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,12 @@ a value of SOGoSMTPServer. This fixes http://www.scalableogo.org/bugs/view.php?id=201 + * SoObjects/Mailer/SOGoMailForward.m (init): + Now consider SOGoMailComposeMessageType instead + of ComposeMessagesType when checking if we are + using HTML mails composition mode. This fixes + http://www.scalableogo.org/bugs/view.php?id=280 + 2009-12-25 Ludovic Marcotte * Tools/SOGoToolBackup.m (-fetchUserIDs:): diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index f2a127f12..70683503e 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -38,7 +38,12 @@ { SOGoUserDefaults *ud; ud = [[context activeUser] userDefaults]; - htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"]; + + // Backward comptability with <= 1.1.0 (ComposeMessagesType) + if ([ud objectForKey: @"ComposeMessagesType"]) + htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"]; + else + htmlComposition = [[ud objectForKey: @"SOGoMailComposeMessageType"] isEqualToString: @"html"]; sourceMail = nil; currentValue = nil;