summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-10-31 09:36:13 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-10-31 09:36:13 +0000
commit58d3dc354d68bfa51da5ddec44de173dda3c7f92 (patch)
tree4d54b852150363ad5acee2f99799c14e36a71a3d /app
parente6112a9710cbe33a0ee5787c14498a55ce9ba891 (diff)
downloadredmine-58d3dc354d68bfa51da5ddec44de173dda3c7f92.tar.gz
redmine-58d3dc354d68bfa51da5ddec44de173dda3c7f92.zip
Fixed that #parse_redmine_links errors when given a link tag without attributes (#19304).
git-svn-id: http://svn.redmine.org/redmine/trunk@14774 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-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 b76c9c4f0..c345083b7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -742,7 +742,7 @@ module ApplicationHelper
# identifier:source:some/file
def parse_redmine_links(text, default_project, obj, attr, only_path, options)
text.gsub!(%r{<a( [^>]+?)?>(.*?)</a>|([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-_]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
- tag_content, leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $1, $3, $4, $5, $6, $7, $12, $13, $10 || $14 || $20, $16 || $21, $17, $19
+ tag_content, leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $2, $3, $4, $5, $6, $7, $12, $13, $10 || $14 || $20, $16 || $21, $17, $19
if tag_content
$&
else