fix problem output->nativebodytype is set too early, as it is used as marker that the original message was of type ... but is now converted to (, as type 2 is requested)

This commit is contained in:
Klaus Leithoff 2015-12-04 13:58:57 +00:00
parent 7b527d699e
commit afcb47bc46

View File

@ -944,7 +944,6 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
if ($this->debugLevel>0) debugLog("HTML Body with requested pref 2");
// Send HTML if requested and native type was html
$output->asbody->type = 2;
$output->nativebodytype = 2;
$htmlbody = '<html>'.
'<head>'.
'<meta name="Generator" content="Z-Push">'.
@ -970,6 +969,8 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
$htmlbody = Utils::Utf8_truncate($htmlbody,$truncsize);
$output->asbody->truncated = 1;
}
// output->nativebodytype is used as marker that the original message was of type ... but is now converted to, as type 2 is requested.
$output->nativebodytype = 2;
$output->asbody->data = $htmlbody;
}
else