From: Eugen Rochko Date: Thu, 29 Aug 2019 23:34:59 +0000 (+0200) Subject: Fix error in warning e-mail template (#11698) X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=14996496a58cdf5f4eaa25f05562f3548b33d10c;p=mastodon.git Fix error in warning e-mail template (#11698) --- diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml index 030a57bb4..1105f2062 100644 --- a/app/views/user_mailer/warning.html.haml +++ b/app/views/user_mailer/warning.html.haml @@ -42,11 +42,11 @@ - unless @warning.text.blank? = Formatter.instance.linkify(@warning.text) - - unless @statuses.empty? + - unless @statuses&.empty? %p %strong= t('user_mailer.warning.statuses') -- unless @statuses.empty? +- unless @statuses&.empty? - @statuses.each_with_index do |status, i| = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true diff --git a/app/views/user_mailer/warning.text.erb b/app/views/user_mailer/warning.text.erb index 24c1f86f2..45ad3b64d 100644 --- a/app/views/user_mailer/warning.text.erb +++ b/app/views/user_mailer/warning.text.erb @@ -7,7 +7,7 @@ <% end %> <%= @warning.text %> -<% unless @statuses.empty? %> +<% unless @statuses&.empty? %> <%= t('user_mailer.warning.statuses') %> <% @statuses.each do |status| %>