]> source.dussan.org Git - redmine.git/commitdiff
Accept project identifier with underscore.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 27 Jan 2012 19:29:07 +0000 (19:29 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Fri, 27 Jan 2012 19:29:07 +0000 (19:29 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8709 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

index fcfb2e7818bbd1c825e031b1d6083d33c7bba299..bd9f54df7058912e9c12ab826b5dfd11c5402511 100644 (file)
@@ -655,7 +655,7 @@ module ApplicationHelper
   #     identifier:version:1.0.0
   #     identifier:source:some/file
   def parse_redmine_links(text, project, obj, attr, only_path, options)
-    text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-]+)\|)?(r)))(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
+    text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-]+)\|)?(r)))(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
       leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier = $1, $2, $3, $4, $5, $10, $11, $8 || $12 || $14, $13 || $15
       link = nil
       if project_identifier