diff options
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/formatter.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/redmine/wiki_formatting/textile/formatter.rb b/lib/redmine/wiki_formatting/textile/formatter.rb index a622e8039..6794f82c7 100644 --- 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 + ((?:>)?|[^\w\=\/;\(\)]*?) # post (?=<|\s|$) }x unless const_defined?(:AUTO_LINK_RE) diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index ad2be56aa..16ef60182 100644 --- 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"bar">http://foo"bar</a>', + # wrap in angle brackets + '<http://foo.bar>' => '<<a class="external" href="http://foo.bar">http://foo.bar</a>>' } to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } end |