Merge remote-tracking branch 'openstreetmap/pull/1122'

[rails.git] / app / helpers / note_helper.rb

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 87bd86f428e4edd7e1e821d84a9840694c8758c7..2a101612928db938e68d3ccb51ce946cc467776a 100644 (file)
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -17,6 +17,8 @@ module NoteHelper
   def note_author(author, link_options = {})
     if author.nil?
       ""
   def note_author(author, link_options = {})
     if author.nil?
       ""

+    elsif author.status == "deleted"
+      t("user.no_such_user.deleted")

     else
       link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
     end
     else
       link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
     end