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

10 years ago · cd4e5057fc
parent 8cbebcac6a
commit cd4e5057fc
1 changed files with 2 additions and 3 deletions
--- 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 '';
    }