From 82dcbb7488ce1625ba4f41fbdc8e6319d3da9691 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 20 Sep 2015 11:45:53 -0400
Subject: [PATCH] Fix various issues in Mailvelope integration (#1490533)
---
program/steps/mail/compose.inc | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index fd87266..0b047d4 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -88,7 +88,7 @@
'selectimportfile', 'messageissent', 'loadingdata', 'nopubkeyfor', 'nopubkeyforsender',
'encryptnoattachments','encryptedsendialog','searchpubkeyservers', 'importpubkeys',
'encryptpubkeysfound', 'search', 'close', 'import', 'keyid', 'keylength', 'keyexpired',
- 'keyrevoked');
+ 'keyrevoked', 'keyimportsuccess', 'keyservererror');
$OUTPUT->set_pagetitle($RCMAIL->gettext('compose'));
@@ -788,7 +788,6 @@
'_uid' => $MESSAGE->uid,
'_part' => $pgp_mime_part->mime_id,
));
- $RCMAIL->output->set_env('compose_mode', $compose_mode);
}
continue;
}
@@ -876,7 +875,7 @@
}
// register this part as pgp encrypted
- if (strpos($body, 'BEGIN PGP MESSAGE') !== false) {
+ if (strpos($body, '-----BEGIN PGP MESSAGE-----') !== false) {
$MESSAGE->pgp_mime = true;
$RCMAIL->output->set_env('pgp_mime_message', array(
'_mbox' => $RCMAIL->storage->get_folder(), '_uid' => $MESSAGE->uid, '_part' => $part->mime_id,
--
Gitblit v1.9.1