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

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 3f5d9f6bad92e918f2343adf1640a7b8c3236d80..36e70063f9ee4374840113c377bd67ba31185edf 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -78,12 +78,18 @@ module RichText
     def linkify(text, mode = :urls)
       link_attr = tag_builder.tag_options(:rel => "nofollow noopener noreferrer")
       Rinku.auto_link(ERB::Util.html_escape(text), mode, link_attr) do |url|
     def linkify(text, mode = :urls)
       link_attr = tag_builder.tag_options(:rel => "nofollow noopener noreferrer")
       Rinku.auto_link(ERB::Util.html_escape(text), mode, link_attr) do |url|

-        %r{^https?://([^/]*)(.*)$}.match(url) do |m|
-          "#{Settings.linkify_hosts_replacement}#{m[2]}" if Settings.linkify_hosts_replacement &&
-                                                            Settings.linkify_hosts&.include?(m[1])
-        end || url
+        url = shorten_host(url, Settings.linkify_hosts, Settings.linkify_hosts_replacement)
+        shorten_host(url, Settings.linkify_wiki_hosts, Settings.linkify_wiki_hosts_replacement)

       end.html_safe
     end
       end.html_safe
     end

+
+    private
+
+    def shorten_host(url, hosts, hosts_replacement)
+      %r{^https?://([^/]*)(.*)$}.match(url) do |m|
+        "#{hosts_replacement}#{m[2]}" if hosts_replacement && hosts&.include?(m[1])
+      end || url
+    end

   end
 
   class HTML < Base
   end
 
   class HTML < Base