From f11ef7e595c5b8cb49ae00dedb005cc10a98d971 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Sun, 6 Dec 2009 20:54:50 -0700 Subject: [PATCH] Fix grabbing message text if it is the entire message --- imp/lib/Mime/Viewer/Smime.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imp/lib/Mime/Viewer/Smime.php b/imp/lib/Mime/Viewer/Smime.php index 03677ddab..01df2d5ac 100644 --- a/imp/lib/Mime/Viewer/Smime.php +++ b/imp/lib/Mime/Viewer/Smime.php @@ -253,9 +253,9 @@ class IMP_Horde_Mime_Viewer_Smime extends Horde_Mime_Viewer_Driver $hdrs->addHeader('From', $this->_mimepart->getMetadata('imp-smime-from')); $stream = $this->_mimepart->toString(array('headers' => $hdrs, 'stream' => true)); } else { - /* This can never be the base of the message since it appears - * only within a multipart/signed part. */ - $stream = $this->_params['contents']->getBodyPart($base_id, array('mimeheaders' => true, 'stream' => true)); + $stream = $base_id + ? $this->_params['contents']->getBodyPart($base_id, array('mimeheaders' => true, 'stream' => true)) + : $this->_params['contents']->fullMessageText(array('stream' => true)); } $raw_text = $this->_mimepart->replaceEOL($stream, Horde_Mime_Part::RFC_EOL); -- 2.11.0