LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regression when attaching files to a reply

pull/42/head
Francis Lachapelle 2014-06-12 09:09:08 -04:00
parent e7ddfb0546
commit 5bb64916c6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -11,6 +11,7 @@ Bug fixes
- fixed Chinese charset handling (#2809) - fixed Chinese charset handling (#2809)
- fixed folder name (calendars and contacts) of new subscriptions (#2801) - fixed folder name (calendars and contacts) of new subscriptions (#2801)
- fixed the reply/forward operation over ActiveSync (#2805) - fixed the reply/forward operation over ActiveSync (#2805)
- fixed regression when attaching files to a reply
2.2.5 (2014-06-05) 2.2.5 (2014-06-05)
------------------ ------------------

3
UI/MailerUI/UIxMailEditor.m
View File

@ -644,8 +644,9 @@ static NSArray *infoKeys = nil;
if (!attachmentAttrs || ![co imap4URL]) if (!attachmentAttrs || ![co imap4URL])
{ {
[co fetchInfo]; [co fetchInfo];
if (![co inReplyTo] && [co IMAP4ID] > -1) if ((![co inReplyTo] || currentAttachment) && [co IMAP4ID] > -1)
{ {
// When currentAttachment is defined, it means we just attached a new file to the mail
mail = [[[SOGoMailObject alloc] initWithImap4URL: [co imap4URL] inContainer: [co container]] autorelease]; mail = [[[SOGoMailObject alloc] initWithImap4URL: [co imap4URL] inContainer: [co container]] autorelease];
a = [mail fetchFileAttachmentKeys]; a = [mail fetchFileAttachmentKeys];
ASSIGN (attachmentAttrs, a); ASSIGN (attachmentAttrs, a);