]> cat aescling's git repositories - mastodon.git/commitdiff
Fix error in warning e-mail template (#11698)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 29 Aug 2019 23:34:59 +0000 (01:34 +0200)
committerGitHub <noreply@github.com>
Thu, 29 Aug 2019 23:34:59 +0000 (01:34 +0200)
app/views/user_mailer/warning.html.haml
app/views/user_mailer/warning.text.erb

index 030a57bb452dd3734e5357adef02aa6c4b744145..1105f2062f627362d68bf768fa6becfd26da1bfe 100644 (file)
                               - 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
 
index 24c1f86f2b7edd6261e1754bc33e87e6986f92aa..45ad3b64d4b0ef99014ad232c9d4e84d5aa51ac0 100644 (file)
@@ -7,7 +7,7 @@
 
 <% end %>
 <%= @warning.text %>
-<% unless @statuses.empty? %>
+<% unless @statuses&.empty? %>
 <%= t('user_mailer.warning.statuses') %>
 
 <% @statuses.each do |status| %>