X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b3d62bb85a03a0b68068d3d2e7801ec2cd2e3e7b..88524547953f87a087f97c0b7dbf398835347d82:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index d3c975df9..26c236b7a 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -97,11 +97,9 @@ class Notifier < ActionMailer::Base
 
   def bug_comment_notification(bug_comment, recipient)
     common_headers recipient
-    commenter_name = bug_comment.user.display_name if bug_comment.user
-    commenter_name = bug_comment.commenter_name unless bug_comment.user
-	owner = (recipient == bug_comment.map_bug.map_bug_comment[0].user);
-    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => commenter_name) if owner
-    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => commenter_name) unless owner
+    owner = (recipient == bug_comment.map_bug.comments.first.user);
+    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.commenter_name) if owner
+    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.commenter_name) unless owner
 
     body :bugurl => url_for(:host => SERVER_URL,
                             :controller => "browse",
@@ -110,7 +108,7 @@ class Notifier < ActionMailer::Base
          :place => bug_comment.map_bug.nearby_place,
          :comment => bug_comment.comment,
          :owner => owner,
-         :commenter => commenter_name
+         :commenter => bug_comment.commenter_name
   end
 
 private