X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/819badd55b1867185ee0bf549791901cdd473574..7b89dc63496de0b6131a93c57d283ebb4490804b:/app/helpers/application_helper.rb?ds=inline

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 34f9a893c..b256dac4c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
   require 'rexml/document'
 
   def sanitize(text)
-    Sanitize.clean(text, Sanitize::Config::OSM)
+    Sanitize.clean(text, Sanitize::Config::OSM).html_safe
   end
 
   def htmlize(text)
@@ -10,7 +10,11 @@ module ApplicationHelper
   end
 
   def linkify(text)
-    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
+    if text.html_safe?
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+    else
+      Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+    end
   end
 
   def html_escape_unicode(text)