Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
d6429640 · Jean-Baptiste Barth · 7824eca7 · d6429640 · d6429640
Commit d6429640 authored Oct 23, 2010 by Jean-Baptiste Barth
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

formatter.rb lib/redmine/wiki_formatting/textile/formatter.rb +1 -1

application_helper_test.rb test/unit/helpers/application_helper_test.rb +2 -0

No files found.
--- a/lib/redmine/wiki_formatting/textile/formatter.rb
+++ b/lib/redmine/wiki_formatting/textile/formatter.rb
@@ -121,7 +121,7 @@ module Redmine
                          (\S+?)                   # url
                          (\/)?                    # slash
                        )
-                        ([^\w\=\/;\(\)]*?)               # post
+                        ((?:&gt;)?|[^\w\=\/;\(\)]*?)               # post
                        (?=<|\s|$)
                       }x unless const_defined?(:AUTO_LINK_RE)
  

--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -79,6 +79,8 @@ class ApplicationHelperTest < ActionView::TestCase
      'http://example.net/path!602815048C7B5C20!302.html' => '<a class="external" href="http://example.net/path!602815048C7B5C20!302.html">http://example.net/path!602815048C7B5C20!302.html</a>',
      # escaping
      'http://foo"bar' => '<a class="external" href="http://foo&quot;bar">http://foo"bar</a>',
+      # wrap in angle brackets
+      '<http://foo.bar>' => '&lt;<a class="external" href="http://foo.bar">http://foo.bar</a>&gt;'
    }
    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
  end