From a3e1e9ef167584653b0c139a68ec635bf066243e Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Fri, 8 May 2020 11:14:59 +1000 Subject: [PATCH] FIX: remove deprecated URI.escape (#9697) During Nokogumbo changes I introduced back URI.escape which is deprecated. --- app/jobs/regular/update_username.rb | 2 +- lib/pretty_text.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/jobs/regular/update_username.rb b/app/jobs/regular/update_username.rb index 7c9fcedb5a2..5a067afb99b 100644 --- a/app/jobs/regular/update_username.rb +++ b/app/jobs/regular/update_username.rb @@ -158,7 +158,7 @@ module Jobs doc.css("a.mention").each do |a| a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}") - a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{URI.escape(@new_username)}") if a["href"] + a["href"] = a["href"].gsub(@cooked_mention_user_path_regex, "/u/#{UrlHelper.encode_component(@new_username)}") if a["href"] end doc.css("aside.quote").each do |aside| diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 9f3f65e3507..f355b898ab9 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -286,7 +286,7 @@ module PrettyText doc.css("a").each do |l| href = l["href"].to_s begin - uri = URI(URI.escape(href)) + uri = URI(UrlHelper.encode_component(href)) site_uri ||= URI(Discourse.base_url) if !uri.host.present? || @@ -466,13 +466,13 @@ module PrettyText case type when USER_TYPE - element['href'] = "#{Discourse::base_uri}/u/#{URI.escape(name)}" + element['href'] = "#{Discourse::base_uri}/u/#{UrlHelper.encode_component(name)}" when GROUP_MENTIONABLE_TYPE element['class'] = 'mention-group notify' - element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}" + element['href'] = "#{Discourse::base_uri}/groups/#{UrlHelper.encode_component(name)}" when GROUP_TYPE element['class'] = 'mention-group' - element['href'] = "#{Discourse::base_uri}/groups/#{URI.escape(name)}" + element['href'] = "#{Discourse::base_uri}/groups/#{UrlHelper.encode_component(name)}" end end end