Merge remote-tracking branch 'upstream/pull/5850'

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 36e70063f9ee4374840113c377bd67ba31185edf..1147cbc6031041beaa88ac85b6636c3259abafb6 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -25,8 +25,6 @@ module RichText
   end
 
   class Base < String
   end
 
   class Base < String

-    include ActionView::Helpers::TagHelper
-

     def spam_score
       link_count = 0
       link_size = 0
     def spam_score
       link_count = 0
       link_size = 0


@@ -76,7 +74,7 @@ module RichText
     end
 
     def linkify(text, mode = :urls)
     end
 
     def linkify(text, mode = :urls)

-      link_attr = tag_builder.tag_options(:rel => "nofollow noopener noreferrer")
+      link_attr = 'rel="nofollow noopener noreferrer"'

       Rinku.auto_link(ERB::Util.html_escape(text), mode, link_attr) do |url|
         url = shorten_host(url, Settings.linkify_hosts, Settings.linkify_hosts_replacement)
         shorten_host(url, Settings.linkify_wiki_hosts, Settings.linkify_wiki_hosts_replacement)
       Rinku.auto_link(ERB::Util.html_escape(text), mode, link_attr) do |url|
         url = shorten_host(url, Settings.linkify_hosts, Settings.linkify_hosts_replacement)
         shorten_host(url, Settings.linkify_wiki_hosts, Settings.linkify_wiki_hosts_replacement)