summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-10-16 06:17:41 +0000
committeralecpl <alec@alec.pl>2010-10-16 06:17:41 +0000
commitbde4219e0d0dc545a92e0c4689edb4a829596522 (patch)
tree69f50a250b2d58ade64164f13df4619619f0cbd8
parent6d5f75670392fbad3431d445be562cf87a4a30cf (diff)
- Fix: cannot access private property rcube_template::$app
-rw-r--r--program/steps/mail/compose.inc8
1 files changed, 4 insertions, 4 deletions
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