From a4b03289d52dd11f0f7eb1cb632d7bc067e54523 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Fri, 21 Apr 2023 03:35:49 +0000 Subject: Merged r22205 from trunk to 5.0-stable (#38464). git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22206 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index e6521656f..cc358ec03 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -273,15 +273,15 @@ module Redmine # %m1%, %m2%... => capture groups matches of the custom field regexp if defined def url_from_pattern(custom_field, value, customized) url = custom_field.url_pattern.to_s.dup - url.gsub!('%value%') {Addressable::URI.encode value.to_s} - url.gsub!('%id%') {Addressable::URI.encode customized.id.to_s} + url.gsub!('%value%') {Addressable::URI.encode_component value.to_s} + url.gsub!('%id%') {Addressable::URI.encode_component customized.id.to_s} url.gsub!('%project_id%') do - Addressable::URI.encode( + Addressable::URI.encode_component( (customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s ) end url.gsub!('%project_identifier%') do - Addressable::URI.encode( + Addressable::URI.encode_component( (customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s ) end @@ -289,7 +289,7 @@ module Redmine url.gsub!(%r{%m(\d+)%}) do m = $1.to_i if matches ||= value.to_s.match(Regexp.new(custom_field.regexp)) - Addressable::URI.encode matches[m].to_s + Addressable::URI.encode_component matches[m].to_s end end end -- cgit v1.2.3