diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2020-04-05 14:35:44 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2020-04-05 14:35:44 +0000 |
| commit | d2579908681f5cc7eb64c5acac3bfeebfe3472b3 (patch) | |
| tree | db802dff753e13061af8a270b3fff8e7419f57e2 /lib | |
| parent | 3fcaff3670d25c872ba1c785ff27277a787f6abb (diff) | |
| download | redmine-d2579908681f5cc7eb64c5acac3bfeebfe3472b3.tar.gz redmine-d2579908681f5cc7eb64c5acac3bfeebfe3472b3.zip | |
Reverts r19489 (#32934).
git-svn-id: http://svn.redmine.org/redmine/trunk@19671 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting/textile/redcloth3.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/wiki_formatting/textile/redcloth3.rb b/lib/redmine/wiki_formatting/textile/redcloth3.rb index 7114dd214..54725d2bf 100644 --- a/lib/redmine/wiki_formatting/textile/redcloth3.rb +++ b/lib/redmine/wiki_formatting/textile/redcloth3.rb @@ -350,7 +350,7 @@ class RedCloth3 < String PUNCT = Regexp::quote( '!"#$%&\'*+,-./:;=?@\\^_`|~' ) PUNCT_NOQ = Regexp::quote( '!"#$&\',./:;=?@\\`|' ) PUNCT_Q = Regexp::quote( '*-_+^~%' ) - HYPERLINK = '(?=\/|https?:\/\/|s?ftps?:\/\/|www\.|mailto:)(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)' + HYPERLINK = '(\S+?)([^\w\s/;=\?]*?)(?=\s|<|$)' # Text markup tags, don't conflict with block tags SIMPLE_HTML_TAGS = [ @@ -815,7 +815,7 @@ class RedCloth3 < String (?:\(([^)]+?)\)(?="))? # $title ": ( # $url - (\/|https?:\/\/|s?ftps?:\/\/|www\.|mailto:) # $proto + (\/|[a-zA-Z]+:\/\/|www\.|mailto:) # $proto [[:alnum:]_\/]\S+? ) (\/)? # $slash |