From cfe26eb30196ea2ffe81fd77552de276760ccb24 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 23 Oct 2019 19:21:24 -0400 Subject: [PATCH] FIX: backwards compatibility for uncompiled email style css --- app/models/email_style.rb | 6 +----- spec/integration/email_style_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/email_style.rb b/app/models/email_style.rb index d02de6a59a3..9aeb483f01b 100644 --- a/app/models/email_style.rb +++ b/app/models/email_style.rb @@ -18,7 +18,7 @@ class EmailStyle end def compiled_css - SiteSetting.email_custom_css_compiled || self.class.default_css_compiled + SiteSetting.email_custom_css_compiled.presence || css end def default_html @@ -38,8 +38,4 @@ class EmailStyle def self.default_css '' end - - def self.default_css_compiled - '' - end end diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rb index bfe08f16a33..ef69850891d 100644 --- a/spec/integration/email_style_spec.rb +++ b/spec/integration/email_style_spec.rb @@ -25,6 +25,12 @@ describe EmailStyle do expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}") end + it 'applies customizations if compiled is missing' do + SiteSetting.remove_override!(:email_custom_css_compiled) + expect(mail_html.scan('

FOR YOU

').count).to eq(1) + expect(mail_html).to match("#{Discourse.base_url}/invites/#{invite.invite_key}") + end + it 'can apply RTL attrs' do SiteSetting.default_locale = 'he' body_attrs = mail_html.match(/])+/)