summaryrefslogtreecommitdiffstats
path: root/app/helpers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-17 19:57:32 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-03-17 19:57:32 +0000
commit0e0b8e0799695c631d7ececa23ce941701069a46 (patch)
treefa9213b4902949c2b2e4d1ae4804535edb3b3123 /app/helpers
parent194dab8e96f632c457e49cce60611c30af68ef5b (diff)
downloadredmine-0e0b8e0799695c631d7ececa23ce941701069a46.tar.gz
redmine-0e0b8e0799695c631d7ececa23ce941701069a46.zip
Accept issue links inside brackets (#4418).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3598 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c490f2b13..760ac4f07 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -541,7 +541,7 @@ module ApplicationHelper
# Forum messages:
# message#1218 -> Link to message with id 1218
def parse_redmine_links(text, project, obj, attr, only_path, options)
- text.gsub!(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
+ text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|\]|<|$)}) do |m|
leading, esc, prefix, sep, identifier = $1, $2, $3, $5 || $7, $6 || $8
link = nil
if esc.nil?