Add some more raw markers

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e285215b8d85a01c81bc7eabb93d58ba233ff774..b256dac4c8fca11a91a95c16658138b5bb20fa55 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
   require 'rexml/document'
 
   def sanitize(text)
   require 'rexml/document'
 
   def sanitize(text)

-    Sanitize.clean(text, Sanitize::Config::OSM)
+    Sanitize.clean(text, Sanitize::Config::OSM).html_safe

   end
 
   def htmlize(text)
   end
 
   def htmlize(text)


@@ -10,11 +10,15 @@ module ApplicationHelper
   end
 
   def linkify(text)
   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)
   end
 
   def html_escape_unicode(text)

-    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
+    chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c|

       c < 127 ? c.chr : "&##{c.to_s};"
     end
 
       c < 127 ? c.chr : "&##{c.to_s};"
     end