diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-10-30 19:56:45 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-10-30 19:57:30 +0100 |
| commit | c839403c19cb9b070daf43475ffddc6fa6113026 (patch) | |
| tree | e14b56c7cfa08142da9d0dadc35ad4aa7d69add3 | |
| parent | cd4e5057fcc2bbbd0ff75994bcd40b4f1228d079 (diff) | |
More get_folder() -> $MESSAGE->folder
| -rw-r--r-- | program/steps/mail/func.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/get.inc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 8dced9b18..a1b2616fd 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1204,7 +1204,7 @@ function rcmail_message_body($attrib) else if (!rcube_utils::mem_check($part->size * 10)) { $out .= html::span('part-notice', $RCMAIL->gettext('messagetoobig'). ' ' . html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id - .'&_mbox='. urlencode($RCMAIL->storage->get_folder()), $RCMAIL->gettext('download'))); + .'&_mbox='. urlencode($MESSAGE->folder), $RCMAIL->gettext('download'))); continue; } @@ -1255,7 +1255,7 @@ function rcmail_message_body($attrib) if (!rcube_utils::mem_check(strlen($MESSAGE->body) * 10)) { $out .= html::span('part-notice', $RCMAIL->gettext('messagetoobig'). ' ' . html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part=0' - .'&_mbox='. urlencode($RCMAIL->storage->get_folder()), $RCMAIL->gettext('download'))); + .'&_mbox='. urlencode($MESSAGE->folder), $RCMAIL->gettext('download'))); } else { $plugin = $RCMAIL->plugins->exec_hook('message_body_prefix', diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 948465604..775349d1c 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -242,7 +242,7 @@ else if (strlen($part_id)) { if (!rcube_utils::mem_check($part->size * 10)) { $out = '<body>' . $RCMAIL->gettext('messagetoobig'). ' ' . html::a('?_task=mail&_action=get&_download=1&_uid='.$MESSAGE->uid.'&_part='.$part->mime_id - .'&_mbox='. urlencode($RCMAIL->storage->get_folder()), $RCMAIL->gettext('download')) . '</body></html>'; + .'&_mbox='. urlencode($MESSAGE->folder), $RCMAIL->gettext('download')) . '</body></html>'; } else { // get part body if not available |