X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/417176f8685ae60b670e609ca4d7e2e7c5c07647..1e19e80d0e2420a1ca1951d364d4a95d159eceeb:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index ee40a0d6e..8e386edf8 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -77,6 +77,9 @@ class Notifier < ActionMailer::Base
       @replyurl = url_for(:host => SERVER_URL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
+      @author = @from_user
+
+      attach_user_avatar(message.sender)
 
       mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
            :to => message.recipient.email,
@@ -107,7 +110,7 @@ class Notifier < ActionMailer::Base
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(comment.user)
 
@@ -126,7 +129,9 @@ class Notifier < ActionMailer::Base
       @friendurl = url_for(:host => SERVER_URL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
+      @author = @friend.befriender.display_name
 
+      attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
            :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end
@@ -146,6 +151,9 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
+      @author = @commenter
+      attach_user_avatar(comment.author)
+
       subject = if @owner
                   I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
                 else
@@ -165,7 +173,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
-      @user_message_author = @commenter
+      @author = @commenter
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@@ -173,7 +181,6 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attach_project_logo
       attach_user_avatar(comment.author)
 
       mail :to => recipient.email, :subject => subject
@@ -196,8 +203,8 @@ class Notifier < ActionMailer::Base
   end
 
   def user_avatar_file_path(user)
-    image = user.image
-    if image.file?
+    image = user && user.image
+    if image && image.file?
       return image.path(:small)
     else
       return "#{Rails.root}/app/assets/images/users/images/small.png"