From bde4219e0d0dc545a92e0c4689edb4a829596522 Mon Sep 17 00:00:00 2001 From: alecpl Date: Sat, 16 Oct 2010 06:17:41 +0000 Subject: - Fix: cannot access private property rcube_template::$app --- program/steps/mail/compose.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'program/steps/mail') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 69d11921a..3661f437e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -864,7 +864,7 @@ function rcmail_remove_signature($body) function rcmail_write_compose_attachments(&$message, $bodyIsHtml) { - global $OUTPUT; + global $RCMAIL; $cid_map = $messages = array(); foreach ((array)$message->mime_parts as $pid => $part) @@ -888,7 +888,7 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) { $_SESSION['compose']['attachments'][$attachment['id']] = $attachment; if ($bodyIsHtml && ($part->content_id || $part->content_location)) { - $url = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id']; + $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id']; if ($part->content_id) $cid_map['cid:'.$part->content_id] = $url; else @@ -906,14 +906,14 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml) function rcmail_write_inline_attachments(&$message) { - global $OUTPUT; + global $RCMAIL; $cid_map = array(); foreach ((array)$message->mime_parts as $pid => $part) { if (($part->content_id || $part->content_location) && $part->filename) { if ($attachment = rcmail_save_attachment($message, $pid)) { $_SESSION['compose']['attachments'][$attachment['id']] = $attachment; - $url = $OUTPUT->app->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id']; + $url = $RCMAIL->comm_path.'&_action=display-attachment&_file=rcmfile'.$attachment['id']; if ($part->content_id) $cid_map['cid:'.$part->content_id] = $url; else -- cgit v1.2.3