Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-05 15:54:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aleksander Machniak
2014-10-30 19:27:34 +01:00
parent 8cbebcac6a
commit cd4e5057fc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
program/steps/mail/show.inc
View File

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