Commit 79a95985 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1230 Reverting change: newlines shouldn't matter in HTML.

Not worth the potential risk even if breaking some old devices.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 1a6ce713
......@@ -2477,15 +2477,13 @@ class MAPIProvider {
}
else {
$body = $this->mapiReadStream($stream, $streamsize);
$message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, str_replace("\n","",str_replace("\r","",$body))));
$message->asbody->data = StringStreamWrapper::Open(Utils::ConvertCodepageStringToUtf8($message->internetcpid, $body));
$message->internetcpid = INTERNET_CPID_UTF8;
}
}
else {
$message->asbody->data = MAPIStreamWrapper::Open($stream);
}
$stat = fstat($message->asbody->data);
$streamsize = $stat['size'];
$message->asbody->estimatedDataSize = $streamsize;
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment