diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-17 16:48:04 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-17 16:48:04 +0000 |
commit | 14b4afeec90a9048d06e5d5dc1ea45927fcc49f8 (patch) | |
tree | 4ac20943be407d2f675eaad1cf84fdf2d32f9e10 /lib/redcloth3.rb | |
parent | 3520961eae873fcbb983414ad8e18500b377c5b7 (diff) | |
download | redmine-14b4afeec90a9048d06e5d5dc1ea45927fcc49f8.tar.gz redmine-14b4afeec90a9048d06e5d5dc1ea45927fcc49f8.zip |
Fixed: http links containing parentheses fail to reder correctly (#1591). Patch by Paul Rivier.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1871 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redcloth3.rb')
-rw-r--r-- | lib/redcloth3.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb index b2e44359e..a5e63262c 100644 --- a/lib/redcloth3.rb +++ b/lib/redcloth3.rb @@ -788,10 +788,10 @@ class RedCloth3 < String ": ([\w\/]\S+?) # $url (\/)? # $slash - ([^\w\/;]*?) # $post + ([^\w\=\/;\(\)]*?) # $post (?=<|\s|$) /x - +#" def inline_textile_link( text ) text.gsub!( LINK_RE ) do |m| pre,atts,text,title,url,slash,post = $~[1..7] @@ -799,6 +799,12 @@ class RedCloth3 < String url, url_title = check_refs( url ) title ||= url_title + # Idea below : an URL with unbalanced parethesis and + # ending by ')' is put into external parenthesis + if ( url[-1]==?) and ((url.count("(") - url.count(")")) < 0 ) ) + url=url[0..-2] # discard closing parenth from url + post = ")"+post # add closing parenth to post + end atts = pba( atts ) atts = " href=\"#{ url }#{ slash }\"#{ atts }" atts << " title=\"#{ title }\"" if title |