Don't trust get_folder(), use $MESSAGE->folder if available

Aleksander Machniak

2014-10-30 bc42d0a041e1054f4a34bdee154c8c9131a3ef6f

Don't trust get_folder(), use $MESSAGE->folder if available

 program/steps/mail/show.inc

@@ -270,14 +270,13 @@

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 '';
    }