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

Cleanup

Browse Source
pull/314/head
Aleksander Machniak 9 years ago
parent 0d9fa7f3dc
commit 3b36bcfb68
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
program/steps/mail/func.inc
Unescape Escape View File

@ -2268,8 +2268,6 @@ function rcmail_save_attachment($message, $pid, $compose_id, $params = array())
if ($attachment['status']) { if ($attachment['status']) {
unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']); unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
$session_key = 'compose_data_' . $compose_id;
// rcube_session::append() replaces current session data with the old values // rcube_session::append() replaces current session data with the old values
// (in rcube_session::reload()). This is a problem in 'compose' action, because before // (in rcube_session::reload()). This is a problem in 'compose' action, because before
// the first append() use we set some important data in the session. // the first append() use we set some important data in the session.
@ -2281,7 +2279,7 @@ function rcmail_save_attachment($message, $pid, $compose_id, $params = array())
$COMPOSE['attachments'][$attachment['id']] = $attachment; $COMPOSE['attachments'][$attachment['id']] = $attachment;
} }
else { else {
$rcmail->session->append($session_key . '.attachments', $attachment['id'], $attachment); $rcmail->session->append('compose_data_' . $compose_id . '.attachments', $attachment['id'], $attachment);
} }
return $attachment; return $attachment;

Write Preview
Loading…
Cancel
Save