Fixed that #parse_redmine_links errors when given a link tag without attributes ...

git-svn-id: http://svn.redmine.org/redmine/trunk@14774 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b76c9c4f0c6aa4be79bd9b2695f964ed0595402e..c345083b70357f15acaf941b49b5360686c632f2 100644 (file)
--- 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

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 883e9d33ea3f0a19e8dba99775a1b59ed5d7e01b..6b0d1c7d30742215c92087be48f22a7fac9e3e14 100644 (file)
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -1263,6 +1263,13 @@ RAW
     end
   end
 
+  def test_parse_redmine_links_should_handle_a_tag_without_attributes
+    text = '<a>http://example.com</a>'
+    expected = text.dup
+    parse_redmine_links(text, nil, nil, nil, true, {})
+    assert_equal expected, text
+  end
+
   def test_due_date_distance_in_words
     to_test = { Date.today => 'Due in 0 days',
                 Date.today + 1 => 'Due in 1 day',