IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: remove deprecated URI.escape (#9697)

Browse Source 
During Nokogumbo changes I introduced back URI.escape which is deprecated.
This commit is contained in:
Krzysztof Kotlarek
2020-05-08 11:14:59 +10:00
committed by GitHub
parent 22dffe6f69
commit a3e1e9ef16
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/update_username.rb
View File

@@ -158,7 +158,7 @@ module Jobs
doc.css("a.mention").each do |a| doc.css("a.mention").each do |a|
a.content = a.content.gsub(@cooked_mention_username_regex, "@#{@new_username}") 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 end
doc.css("aside.quote").each do |aside| doc.css("aside.quote").each do |aside|

8
lib/pretty_text.rb
View File

@@ -286,7 +286,7 @@ module PrettyText
doc.css("a").each do |l| doc.css("a").each do |l|
href = l["href"].to_s href = l["href"].to_s
begin begin
uri = URI(URI.escape(href)) uri = URI(UrlHelper.encode_component(href))
site_uri ||= URI(Discourse.base_url) site_uri ||= URI(Discourse.base_url)
if !uri.host.present? || if !uri.host.present? ||
@@ -466,13 +466,13 @@ module PrettyText
case type case type
when USER_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 when GROUP_MENTIONABLE_TYPE
element['class'] = 'mention-group notify' 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 when GROUP_TYPE
element['class'] = 'mention-group' 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 end
end end