diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-24 14:20:01 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-24 14:20:01 +0000 |
| commit | fb9a2901e969548a2859b2875e1684a0e21362f6 (patch) | |
| tree | 1d9115b0c73ac3f2640856587991260677f3a192 /lib | |
| parent | b94c971755ec0de932cb55ed5b813bbb033b6141 (diff) | |
| download | redmine-fb9a2901e969548a2859b2875e1684a0e21362f6.tar.gz redmine-fb9a2901e969548a2859b2875e1684a0e21362f6.zip | |
Fixed that autolinks and textile links ending with cyrilic characters are broken (#12397).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10879 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redcloth3.rb | 4 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index ee934b6ab..0d6ca324c 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -816,10 +816,10 @@ class RedCloth3 < String ": ( # $url (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto - [\w\/]\S+? + [[:alnum:]_\/]\S+? ) (\/)? # $slash - ([^\w\=\/;\(\)]*?) # $post + ([^[:alnum:]_\=\/;\(\)]*?) # $post ) (?=<|\s|$) /x diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 800200e14..5691b1acb 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -98,7 +98,7 @@ module Redmine (\S+?) # url (\/)? # slash ) - ((?:>)?|[^\w\=\/;\(\)]*?) # post + ((?:>)?|[^[:alnum:]_\=\/;\(\)]*?) # post (?=<|\s|$) }x unless const_defined?(:AUTO_LINK_RE) |