From bc42d0a041e1054f4a34bdee154c8c9131a3ef6f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 30 Oct 2014 14:28:27 -0400
Subject: [PATCH] Don't trust get_folder(), use $MESSAGE->folder if available
---
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 afaa0da..ea148d5 100644
--- a/program/steps/mail/show.inc
+++ b/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 '';
}
--
Gitblit v1.9.1