X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/36a3dfe7cd64ffea5f5e8ded9dc1e8ae84c2a06a..1d6051d08b5268a30122a6ca9ea04f6a03544737:/app/helpers/application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8073c2583..b77ac8721 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -6,11 +6,23 @@ module ApplicationHelper
   end
 
   def htmlize(text)
-    return linkify(sanitize(simple_format(text)))
+    logger.info "text safety is #{text.html_safe?}"
+    r = simple_format(text)
+    logger.info "formatted text safety is #{r.html_safe?}"
+    r = sanitize(r)
+    logger.info "sanitised text safety is #{r.html_safe?}"
+    r = linkify(r)
+    logger.info "linkified text safety is #{r.html_safe?}"
+    return r
+#    return linkify(sanitize(simple_format(text)))
   end
 
   def linkify(text)
-    return Rinku.auto_link(text, :urls, tag_options(: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)