From 9312ba2cb6c31774d7b5af40f48d6ec80e27d6d9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 23 May 2013 15:34:51 +0200 Subject: Fix fatal error when parsing UUencoded messages (#1489119) Conflicts: CHANGELOG --- CHANGELOG | 2 ++ program/lib/Roundcube/rcube_message.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index acd41b259..7f465d825 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Fix fatal error when parsing UUencoded messages (#1489119) + RELEASE 0.9.1 ------------- - Better German labels for from/to to avoid conflicts with 'sender' (#1489084) diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index e10ed397e..a8bcf6afc 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -756,7 +756,7 @@ class rcube_message $uupart->size = strlen($uupart->body); $uupart->mime_id = 'uu.' . $part->mime_id . '.' . $pid; - $ctype = rcube_mime::content_type($uupart->body, $uupart->filename, 'application/octet-stream', true); + $ctype = rcube_mime::file_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true); $uupart->mimetype = $ctype; list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype); -- cgit v1.2.3