Stricter textile links parsing (#2417).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2212 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-12-30 16:23:05 +00:00
parent 421539e3be
commit 8b7fb7213f

View File

@ -791,7 +791,10 @@ class RedCloth3 < String
\s? \s?
(?:\(([^)]+?)\)(?="))? # $title (?:\(([^)]+?)\)(?="))? # $title
": ":
([\w\/]\S+?) # $url ( # $url
(\/|https?:\/\/|s?ftps?:\/\/|www\.)
[\w\/]\S+?
)
(\/)? # $slash (\/)? # $slash
([^\w\=\/;\(\)]*?) # $post ([^\w\=\/;\(\)]*?) # $post
(?=<|\s|$) (?=<|\s|$)
@ -799,7 +802,7 @@ class RedCloth3 < String
#" #"
def inline_textile_link( text ) def inline_textile_link( text )
text.gsub!( LINK_RE ) do |m| text.gsub!( LINK_RE ) do |m|
pre,atts,text,title,url,slash,post = $~[1..7] pre,atts,text,title,url,proto,slash,post = $~[1..8]
url, url_title = check_refs( url ) url, url_title = check_refs( url )
title ||= url_title title ||= url_title