From 2382c6e822c5268fb6112ad5e8ab16f718112dae Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Dec 2015 04:14:21 -0500
Subject: [PATCH] Fix regression in displaying contents of message/rfc822 parts (#1490606)

---
 CHANGELOG                   |    1 +
 program/steps/mail/func.inc |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 63c52bd..cb04b39 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@
 - 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
 -------------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 8cb1e8e..d4fed14 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1225,6 +1225,8 @@
                         $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

--
Gitblit v1.9.1