diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-04-10 23:12:23 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-04-10 23:21:41 +0200 |
| commit | 706d3f472f1607004ae35a155a80c63239509323 (patch) | |
| tree | 1282e7110daced7c3231fc91dba977d92b00db8e /program/lib/Roundcube/rcube_message.php | |
| parent | 6f4b50abea536bd13a3dc6dde04aaee825dc8c8e (diff) | |
Skip filename suffix check for embedded images; return blocked.gif instead of HTML warning when embedded (#1489029)
Diffstat (limited to 'program/lib/Roundcube/rcube_message.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_message.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 4e454c60a..0701cc0ee 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -149,12 +149,13 @@ class rcube_message * Compose a valid URL for getting a message part * * @param string $mime_id Part MIME-ID + * @param mixed $embed Mimetype class for parts to be embedded * @return string URL or false if part does not exist */ public function get_part_url($mime_id, $embed = false) { if ($this->mime_parts[$mime_id]) - return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1' : ''); + return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1&_mimeclass=' . $embed : ''); else return false; } @@ -613,8 +614,8 @@ class rcube_message $img_regexp = '/^image\/(gif|jpe?g|png|tiff|bmp|svg)/'; foreach ($this->inline_parts as $inline_object) { - $part_url = $this->get_part_url($inline_object->mime_id, true); - if ($inline_object->content_id) + $part_url = $this->get_part_url($inline_object->mime_id, $inline_object->ctype_primary); + if (isset($inline_object->content_id)) $a_replaces['cid:'.$inline_object->content_id] = $part_url; if ($inline_object->content_location) { $a_replaces[$inline_object->content_location] = $part_url; |