X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/09362214fb49d42a076a5081303a36ed9555469e..d94a5a24b0907c610377a5a8d4abb8c877e67145:/lib/rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index c20f973b1..d6df214d1 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -76,11 +76,7 @@ module RichText
     end
 
     def linkify(text, mode = :urls)
-      if text.html_safe?
-        Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer")).html_safe
-      else
-        Rinku.auto_link(text, mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer"))
-      end
+      Rinku.auto_link(ERB::Util.html_escape(text), mode, tag_builder.tag_options(:rel => "nofollow noopener noreferrer")).html_safe
     end
   end