From a9e02d94a26cd30c9e56196a1ec24ddec0c4db9c Mon Sep 17 00:00:00 2001 From: smizrahi Date: Thu, 4 Apr 2024 18:20:06 +0200 Subject: [PATCH] feat(core): Update to ckeditor 5. Fixes #5920. Add raw-html-embed only on html signatures --- SoObjects/SOGo/SOGoUser.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 27cee8ba9..fc224abaf 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -1109,9 +1109,10 @@ static const NSString *kEncryptedUserNamePrefix = @"uenc"; tmpIdentities = [NSMutableArray array]; for (identity in identities) { tmpIdentity = [NSMutableDictionary dictionaryWithDictionary: identity]; - if ([tmpIdentity objectForKey: @"signature"]) { + if ([tmpIdentity objectForKey: @"signature"] ) { // Add raw html embed class - if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound) { + if ([[tmpIdentity objectForKey: @"signature"] rangeOfString:@"raw-html-embed"].location == NSNotFound + && [[[self userDefaults] mailComposeMessageType] isEqualToString: @"html"]) { signature = [NSString stringWithFormat:@"
%@
", [tmpIdentity objectForKey: @"signature"]]; [tmpIdentity setObject:signature forKey:@"signature"]; }