Don't try to add attachments during reply operations
parent
f0dfe37a55
commit
0c2e2f28f7
1
NEWS
1
NEWS
|
@ -7,6 +7,7 @@ Enhancements
|
|||
|
||||
Bug fixes
|
||||
- avoid crashing when we forward an email with no Subject header
|
||||
- we no longer try to include attachments when replying to a mail
|
||||
|
||||
2.2.4 (2014-05-29)
|
||||
------------------
|
||||
|
|
|
@ -1,20 +1,21 @@
|
|||
/*
|
||||
Copyright (C) 2007-2014 Inverse inc.
|
||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||
|
||||
This file is part of OpenGroupware.org.
|
||||
This file is part of SOGo.
|
||||
|
||||
OGo is free software; you can redistribute it and/or modify it under
|
||||
SOGo is free software; you can redistribute it and/or modify it under
|
||||
the terms of the GNU Lesser General Public License as published by the
|
||||
Free Software Foundation; either version 2, or (at your option) any
|
||||
later version.
|
||||
|
||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||
License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with OGo; see the file COPYING. If not, write to the
|
||||
License along with SOGo; see the file COPYING. If not, write to the
|
||||
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
02111-1307, USA.
|
||||
*/
|
||||
|
@ -78,6 +79,9 @@
|
|||
- (BOOL) isHTML;
|
||||
|
||||
/* for replies and forwards */
|
||||
- (NSString *) inReplyTo;
|
||||
- (void) setInReplyTo: (NSString *) newInReplyTo;
|
||||
|
||||
- (void) setSourceURL: (NSString *) newSurceURL;
|
||||
- (void) setSourceFlag: (NSString *) newSourceFlag;
|
||||
- (void) setSourceFolder: (NSString *) newSourceFolder;
|
||||
|
|
|
@ -396,6 +396,11 @@ static NSString *userAgent = nil;
|
|||
return isHTML;
|
||||
}
|
||||
|
||||
- (NSString *) inReplyTo
|
||||
{
|
||||
return inReplyTo;
|
||||
}
|
||||
|
||||
- (void) setInReplyTo: (NSString *) newInReplyTo
|
||||
{
|
||||
ASSIGN (inReplyTo, newInReplyTo);
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
/* SOGoDraftsFolder.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2007 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
* Copyright (C) 2007-2014 Inverse inc.
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
|
@ -636,15 +636,15 @@ static NSArray *infoKeys = nil;
|
|||
|
||||
- (NSArray *) attachmentAttrs
|
||||
{
|
||||
NSArray *a;
|
||||
SOGoDraftObject *co;
|
||||
SOGoMailObject *mail;
|
||||
NSArray *a;
|
||||
|
||||
co = [self clientObject];
|
||||
if (!attachmentAttrs || ![co imap4URL])
|
||||
{
|
||||
[co fetchInfo];
|
||||
if ([co IMAP4ID] > -1)
|
||||
if (![co inReplyTo] && [co IMAP4ID] > -1)
|
||||
{
|
||||
mail = [[[SOGoMailObject alloc] initWithImap4URL: [co imap4URL] inContainer: [co container]] autorelease];
|
||||
a = [mail fetchFileAttachmentKeys];
|
||||
|
|
Loading…
Reference in New Issue