ref C3S#5: html in encrypted mails only if html globally enabled

garrettr · Sep 11, 2015 · b28acb6 · b28acb6
1 parent 4f3b2d3
commit b28acb6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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