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:28:27 +0100 |
| commit | bc42d0a041e1054f4a34bdee154c8c9131a3ef6f (patch) | |
| tree | 7e8334a5158e52ba20abff9c0922243900daf0e8 /program | |
| parent | 73b14686fc7f2ac028af4e8366e7d3882d2894a8 (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 afaa0da6f..ea148d5d6 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -270,14 +270,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 ''; } |