summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-30 19:56:45 +0100
committerAleksander Machniak <alec@alec.pl>2014-10-30 19:56:45 +0100
commite03bcf3406722b2fe3a514524b117420f07baa19 (patch)
treefe773f9587bee66c8149e59c93728631004d68b3
parentbc42d0a041e1054f4a34bdee154c8c9131a3ef6f (diff)
More get_folder() -> $MESSAGE->folder
-rw-r--r--program/steps/mail/func.inc4
-rw-r--r--program/steps/mail/get.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 5cf5dfde5..068bc8ef4 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1187,7 +1187,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;
}
@@ -1244,7 +1244,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 8b9a0392c..8a4217d5d 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -247,7 +247,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