Make linkify preserve HTML safety

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8073c2583d0f88b5f0d258f85e5b1448e11e8683..b77ac87215351fac98b7198179db05d9c4003e9d 100644 (file)
--- 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)