X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e1c62f1bf21fa80d5873c0a75583450ae88b16d7..e693063fa55f613364527abb7dbef0933bfe042e:/app/helpers/application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c78c3ea46..79c6e6134 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,7 +5,7 @@ module ApplicationHelper
     if text.html_safe?
       Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
     else
-      Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow"))
+      Rinku.auto_link(ERB::Util.h(text), :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
     end
   end
 
@@ -49,6 +49,10 @@ module ApplicationHelper
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
 
+  def friendly_date_ago(date)
+    content_tag(:span, time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly))
+  end
+
   def body_class
     if content_for? :body_class
       content_for :body_class