Fix regression in displaying contents of message/rfc822 parts (#1490606)

Conflicts: CHANGELOG
9 years ago · 2382c6e822
parent b6b92c0ddd
commit 2382c6e822
2 changed files with 3 additions and 0 deletions
--- a/1
+++ b/1
@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
 - Fix redundant blank lines on start of text after html to text conversion (#1490577)
 - Fix HTML sanitizer to skip <!-- node type X --> in output (#1490583)
 - Fix invalid LDAP query in ACL user autocompletion (#1490591)
+- Fix regression in displaying contents of message/rfc822 parts (#1490606)

 RELEASE 1.1.3
 -------------
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@ -1225,6 +1225,8 @@ function rcmail_message_body($attrib)
                        $part = $msgpart;
                        $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
                    }
+
+                    $body = $part->body;
                }

                // message is cached but not exists (#1485443), or other error