mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-15 18:00:15 +01:00
fixed a bug/problem introduced by patch r24492 (doubling of the mailheader) if you are forwarding a mail, with headers already present
This commit is contained in:
parent
ac86714bc5
commit
ac7199beac
@ -708,16 +708,16 @@
|
|||||||
if(!empty($attachment['uid']) && !empty($attachment['folder'])) {
|
if(!empty($attachment['uid']) && !empty($attachment['folder'])) {
|
||||||
switch($attachment['type']) {
|
switch($attachment['type']) {
|
||||||
case 'MESSAGE/RFC822':
|
case 'MESSAGE/RFC822':
|
||||||
|
$rawHeader='';
|
||||||
$bofelamimail->openConnection();
|
$bofelamimail->openConnection();
|
||||||
$bofelamimail->reopen($attachment['folder']);
|
$bofelamimail->reopen($attachment['folder']);
|
||||||
$rawHeader = $bofelamimail->getMessageRawHeader($attachment['uid'], $attachment['partID']);
|
if (isset($attachment['partID'])) {
|
||||||
$rawBody = $bofelamimail->getMessageRawBody($attachment['uid'], $attachment['partID']);
|
$rawHeader = $bofelamimail->getMessageRawHeader($attachment['uid'], $attachment['partID']);
|
||||||
|
}
|
||||||
|
$rawBody = $bofelamimail->getMessageRawBody($attachment['uid'], $attachment['partID']);
|
||||||
$bofelamimail->closeConnection();
|
$bofelamimail->closeConnection();
|
||||||
|
|
||||||
$_mailObject->AddStringAttachment($rawHeader.$rawBody, $attachment['name'], '7bit', 'message/rfc822');
|
$_mailObject->AddStringAttachment($rawHeader.$rawBody, $attachment['name'], '7bit', 'message/rfc822');
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$bofelamimail->openConnection();
|
$bofelamimail->openConnection();
|
||||||
$bofelamimail->reopen($attachment['folder']);
|
$bofelamimail->reopen($attachment['folder']);
|
||||||
|
Loading…
Reference in New Issue
Block a user