diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-03-03 15:18:04 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-03-03 15:18:04 +0000 |
| commit | 193b02567b1d889324d8709547b135e14f80d837 (patch) | |
| tree | d71db95aecaad0d50e785505197033c299a84eef /lib | |
| parent | 3c85ee43faab2afbf15cb9ef0d9ccb053ea2c382 (diff) | |
| download | redmine-193b02567b1d889324d8709547b135e14f80d837.tar.gz redmine-193b02567b1d889324d8709547b135e14f80d837.zip | |
URLs end with "-" are rendered incorrectly in Textile (#30259).
Patch by Yuichi HARADA.
git-svn-id: http://svn.redmine.org/redmine/trunk@17917 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 2 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/redcloth3.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 66764551d..d4dd05a93 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -125,7 +125,7 @@ module Redmine ([^<]\S*?) # url (\/)? # slash ) - ((?:>)?|[^[:alnum:]_\=\/;\(\)]*?) # post + ((?:>)?|[^[:alnum:]_\=\/;\(\)\-]*?) # post (?=<|\s|$) }x unless const_defined?(:AUTO_LINK_RE) diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb index 5fbfc4338..5da17be5b 100644 --- a/lib/redmine/wiki_formatting/textile/redcloth3.rb +++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb @@ -272,8 +272,8 @@ class RedCloth3 < String @urlrefs = {} @shelf = [] textile_rules = [:block_textile_table, :block_textile_lists, - :block_textile_prefix, :inline_textile_image, :inline_textile_link, - :inline_textile_code, :inline_textile_span, :glyphs_textile] + :block_textile_prefix, :inline_textile_image, :inline_textile_code, + :inline_textile_span, :inline_textile_link, :glyphs_textile] markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule, :block_markdown_bq, :block_markdown_lists, :inline_markdown_reflink, :inline_markdown_link] @@ -829,7 +829,7 @@ class RedCloth3 < String [[:alnum:]_\/]\S+? ) (\/)? # $slash - ([^[:alnum:]_\=\/;\(\)]*?) # $post + ([^[:alnum:]_\=\/;\(\)\-]*?) # $post ) (?=<|\s|$) /x |