From 0597586b89e86e8b4e22080d4c453475057b47b5 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 30 Nov 2011 11:35:43 +0000 Subject: - Applied fixes from trunk up to r5512 --- program/steps/mail/func.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'program/steps/mail/func.inc') diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 8407b06cd..c070dad3a 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -550,7 +550,7 @@ function rcmail_check_safe(&$message) * @param array CID map replaces (inline images) * @return string Clean HTML */ -function rcmail_wash_html($html, $p = array(), $cid_replaces) +function rcmail_wash_html($html, $p, $cid_replaces) { global $REMOTE_OBJECTS; @@ -1052,7 +1052,7 @@ function rcmail_message_body($attrib) ) { $out .= html::tag('hr') . html::p(array('align' => "center"), html::img(array( - 'src' => $MESSAGE->get_part_url($attach_prop->mime_id), + 'src' => $MESSAGE->get_part_url($attach_prop->mime_id, true), 'title' => $attach_prop->filename, 'alt' => $attach_prop->filename, ))); -- cgit v1.2.3