amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-09 18:35:10 +00:00
Code Issues Projects Releases Wiki Activity

Encode HTML entities for inline forwards in text

Browse Source 
Fixes #2411
This commit is contained in:
Francis Lachapelle
2014-02-05 11:17:22 -05:00
parent 826537ed01
commit 359b6a99aa
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Mailer/NSString+Mail.m
+1 -2
View File
@@ -613,8 +613,7 @@ convertChars (const char *oldString, unsigned int oldLength,
unsigned int newLength;
utf8String = [self UTF8String];
newString = convertChars (utf8String, strlen (utf8String),
&newLength);
newString = convertChars (utf8String, strlen (utf8String), &newLength);
convertedString = [[NSString alloc] initWithBytes: newString
length: newLength
encoding: NSUTF8StringEncoding];
SoObjects/Mailer/SOGoMailObject+Draft.m
+3 -3
View File
@@ -94,7 +94,7 @@
if (html && !htmlComposition)
rc = [raw htmlToText];
else if (!html && htmlComposition)
rc = [raw stringByConvertingCRLNToHTML];
rc = [[raw stringByEscapingHTMLString] stringByConvertingCRLNToHTML];
else
rc = raw;
@@ -171,8 +171,8 @@
= [NSArray arrayWithObjects: @"text/plain", @"text/html", nil];
keys = [NSMutableArray array];
[self addRequiredKeysOfStructure: [self bodyStructure]
path: @"" toArray: keys acceptedTypes: acceptedTypes
withPeek: NO];
path: @"" toArray: keys acceptedTypes: acceptedTypes
withPeek: NO];
return [self _contentForEditingFromKeys: keys];
}