From b28acb6da55b146cac6a5454da08d079cad37f87 Mon Sep 17 00:00:00 2001 From: Alexander Blum Date: Fri, 11 Sep 2015 09:30:38 +0200 Subject: [PATCH] ref #5: html in encrypted mails only if html globally enabled --- lib/encrypt_mails.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/encrypt_mails.rb b/lib/encrypt_mails.rb index 2f89f67..97febdb 100644 --- a/lib/encrypt_mails.rb +++ b/lib/encrypt_mails.rb @@ -43,7 +43,8 @@ def mail_with_relocation(headers={}, &block) headers, recipients[:encrypted], encrypt = true, sign = true ) do |format| format.text - format.html if Setting.plugin_openpgp['encrypted_html'] + format.html if not Setting.plain_text_mail? and + Setting.plugin_openpgp['encrypted_html'] end m.deliver