diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-10-30 19:27:34 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-10-30 19:27:34 +0100 |
| commit | cd4e5057fcc2bbbd0ff75994bcd40b4f1228d079 (patch) | |
| tree | 2b06616421bedb954eb401bf45e5454b74de476c /program | |
| parent | 8cbebcac6aba53860a022c699a5384cbabc06a87 (diff) | |
Don't trust get_folder(), use $MESSAGE->folder if available
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/show.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index d4121fdd8..d3edde277 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -275,14 +275,13 @@ function rcmail_remote_objects_msg() function rcmail_message_buttons() { - global $RCMAIL; + global $RCMAIL, $MESSAGE; - $mbox = $RCMAIL->storage->get_folder(); $delim = $RCMAIL->storage->get_hierarchy_delimiter(); $dbox = $RCMAIL->config->get('drafts_mbox'); // the message is not a draft - if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) { + if ($MESSAGE->folder != $dbox && strpos($MESSAGE->folder, $dbox.$delim) !== 0) { return ''; } |