Bug 1530106 - follow-up to move the mail.html_sanitize.drop_conditional_css pref to mailnews.js. r=mkmelin
authorKai Engert <kaie@kuix.de>
Thu, 05 Dec 2019 11:51:37 +0200
changeset 37698 98d3639a346e8049888368e789e56c58f6273153
parent 37697 8d558f7fb2cc3088b6c797354ae164c0012b4ce2
child 37699 cf982e0a8b1ba0e45b3f2de6084ed9eb799e74c1
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersmkmelin
bugs1530106
Bug 1530106 - follow-up to move the mail.html_sanitize.drop_conditional_css pref to mailnews.js. r=mkmelin
mail/app/profile/all-thunderbird.js
mailnews/mailnews.js
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -236,19 +236,16 @@ pref("mailnews.headers.show_n_lines_befo
 
 // We want to keep track of what items are appropriate in
 // XULStore.json. We use versioning to scrub out the things
 // that have become obsolete.
 // The value will always be set by startup code and must not be changed
 // here. A value of 0 means a new profile.
 pref("mail.ui-rdf.version", 0);
 
-// Strip CSS conditional rules in received and sent mail
-pref("mail.html_sanitize.drop_conditional_css", true);
-
 /////////////////////////////////////////////////////////////////
 // Overrides of the core mailnews.js and composer.js prefs
 /////////////////////////////////////////////////////////////////
 pref("mail.showCondensedAddresses", true); // show the friendly display name for people I know
 
 pref("mailnews.attachments.display.start_expanded", false);
 // hidden pref for changing how we present attachments in the message pane
 pref("mailnews.attachments.display.view", 0);
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -623,16 +623,19 @@ pref("mail.smtp.useMatchingHostNameServe
 pref("mail.smtp.useSenderForSmtpMailFrom", true);
 
 pref("mail.smtpserver.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod.
 pref("mail.smtpserver.default.try_ssl", 0); // @see nsISmtpServer.socketType
 
 // If true, SMTP LOGIN auth and POP3 USER/PASS auth, the last of the methods to try, will use Latin1.
 pref("mail.smtp_login_pop3_user_pass_auth_is_latin1", true);
 
+// Strip CSS conditional rules in received and sent mail
+pref("mail.html_sanitize.drop_conditional_css", true);
+
 // For the next 3 prefs, see <http://www.bucksch.org/1/projects/mozilla/16507>
 pref("mail.display_glyph", true);   // TXT->HTML :-) etc. in viewer
 pref("mail.display_struct", true);  // TXT->HTML *bold* etc. in viewer; ditto
 pref("mail.send_struct", false);   // HTML->HTML *bold* etc. during Send; ditto
 // display time and date in message pane using senders timezone
 pref("mailnews.display.date_senders_timezone", false);
 // For the next 4 prefs, see <http://www.bucksch.org/1/projects/mozilla/108153>
 pref("mailnews.display.prefer_plaintext", false);  // Ignore HTML parts in multipart/alternative