Merge branch 'master' into openstreetbugs

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index a41b39a3deac07a9c7165648b1946a885b1bae18..9a49abd679c015f4c3a02259e9b9a2ac849f549d 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -42,6 +42,14 @@ module BrowseHelper
     end
   end
 
+  def note_author(object)
+    if object.author.nil?
+      h(object.author_name)
+    else
+      link_to h(object.author_name), :controller => "user", :action => "view", :display_name => object.author_name
+    end
+  end
+
 private
 
   ICON_TAGS = [