Merge branch 'master' into notes-search

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index db296967ba3aa13d43371a67ba2dec87505cf8a2..d0539b2b081293e12d68d80b8b1058286c8167d8 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -57,9 +57,9 @@ module RichText
 
     def linkify(text)
       if text.html_safe?
-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
+        Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow")).html_safe
       else
-        Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow"))
+        Rinku.auto_link(text, :urls, tag_builder.tag_options(:rel => "nofollow"))
       end
     end
   end