banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fix: cannot access private property rcube_template::$app

Browse Source
release-0.6
alecpl 14 years ago
parent 6d5f756703
commit bde4219e0d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
program/steps/mail/compose.inc
Unescape Escape View File

@ -864,7 +864,7 @@ function rcmail_remove_signature($body)
function rcmail_write_compose_attachments(&$message, $bodyIsHtml) function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
{ {
global $OUTPUT; global $RCMAIL;
$cid_map = $messages = array(); $cid_map = $messages = array();
foreach ((array)$message->mime_parts as $pid => $part) 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))) { if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
$_SESSION['compose']['attachments'][$attachment['id']] = $attachment; $_SESSION['compose']['attachments'][$attachment['id']] = $attachment;
if ($bodyIsHtml && ($part->content_id || $part->content_location)) { 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) if ($part->content_id)
$cid_map['cid:'.$part->content_id] = $url; $cid_map['cid:'.$part->content_id] = $url;
else else
@ -906,14 +906,14 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
function rcmail_write_inline_attachments(&$message) function rcmail_write_inline_attachments(&$message)
{ {
global $OUTPUT; global $RCMAIL;
$cid_map = array(); $cid_map = array();
foreach ((array)$message->mime_parts as $pid => $part) { foreach ((array)$message->mime_parts as $pid => $part) {
if (($part->content_id || $part->content_location) && $part->filename) { if (($part->content_id || $part->content_location) && $part->filename) {
if ($attachment = rcmail_save_attachment($message, $pid)) { if ($attachment = rcmail_save_attachment($message, $pid)) {
$_SESSION['compose']['attachments'][$attachment['id']] = $attachment; $_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) if ($part->content_id)
$cid_map['cid:'.$part->content_id] = $url; $cid_map['cid:'.$part->content_id] = $url;
else else

Write Preview
Loading…
Cancel
Save