summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-09-05 10:55:52 +0000
committerthomascube <thomas@roundcube.net>2008-09-05 10:55:52 +0000
commit6695db83ca9bafb4dbecff6fedc2b5cd775024f3 (patch)
treedcc345cbecb88a4cbcfbcf4e7b20c897d43ebcf8
parent6e6e89324c231737936acc3a30558df7e9649551 (diff)
Allow application/pgp parts to be displayed (#1484753)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_message.php5
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 124b52e19..cbe7dcdc8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ CHANGELOG RoundCube Webmail
- Applied mime_decode patch by David Lublink
- Allowed max. attachment size now indicated in compose screen (#1485030)
- Also capture backspace key in list mode (#1484566)
+- Allow application/pgp parts to be displayed (#1484753)
2008/09/04 (alec)
----------
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 329c39049..c18db4bdd 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -230,6 +230,11 @@ class rcube_message
$structure->type = 'content';
$this->parts[] = &$structure;
}
+ // the same for pgp signed messages
+ else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
+ $structure->type = 'content';
+ $this->parts[] = &$structure;
+ }
// message contains alternative parts
else if ($message_ctype_primary == 'multipart' && ($message_ctype_secondary == 'alternative') && is_array($structure->parts)) {
// get html/plaintext parts