From c6e20372fd7a3711a87cd61cce6d232084955811 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 2 Oct 2016 10:12:19 +0000 Subject: Merged r15846 (#23841). git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15867 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index 0347ca8da..c7fcca987 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -202,19 +202,19 @@ 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%') {value.to_s} - url.gsub!('%id%') {customized.id.to_s} - url.gsub!('%project_id%') {(customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s} - url.gsub!('%project_identifier%') {(customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s} + url.gsub!('%value%') {URI.encode value.to_s} + url.gsub!('%id%') {URI.encode customized.id.to_s} + url.gsub!('%project_id%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s} + url.gsub!('%project_identifier%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s} if custom_field.regexp.present? url.gsub!(%r{%m(\d+)%}) do m = $1.to_i if matches ||= value.to_s.match(Regexp.new(custom_field.regexp)) - matches[m].to_s + URI.encode matches[m].to_s end end end - URI.encode(url) + url end protected :url_from_pattern -- cgit v1.2.3