merge 19601:19888 of rails_port into the openID branch

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bee4f9ce2f4dc5a6ec30ab8fb90b816675da3860..d805e27adee83bfe8518ec846b943940e5fd7dbb 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,18 @@
 module ApplicationHelper
   def htmlize(text)
-    return sanitize(auto_link(simple_format(text), :urls))
+    return linkify(sanitize(simple_format(text)))
+  end
+
+  def linkify(text)
+    return auto_link(text, :link => :urls, :html => { :rel => "nofollow" })
+  end
+
+  def html_escape_unicode(text)
+    chars = ActiveSupport::Multibyte::Chars.u_unpack(text).map do |c|
+      c < 127 ? c.chr : "&##{c.to_s};"
+    end
+
+    return chars.join("")
   end
 
   def rss_link_to(*args)