Merge remote-tracking branch 'upstream/pull/4221'

[rails.git] / app / views / user_mailer / _message_body.html.erb

diff --git a/app/views/user_mailer/_message_body.html.erb b/app/views/user_mailer/_message_body.html.erb
index d572fb9d0a79e92e7486b56218d63792295b0116..851f153a2a9a2a1938d0130b97098d5b42a687b6 100644 (file)
--- a/app/views/user_mailer/_message_body.html.erb
+++ b/app/views/user_mailer/_message_body.html.erb
@@ -3,7 +3,7 @@
     <td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
       <%= link_to(
             image_tag(
     <td style="width: 50px; min-width: 50px; vertical-align: top; padding: 15px">
       <%= link_to(
             image_tag(

-              attachments["avatar.png"].url,
+              attachments[@avatar].url,

               :alt => @author,
               :title => @author,
               :width => 50,
               :alt => @author,
               :title => @author,
               :width => 50,