Stricter textile links parsing (#2417).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2212 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index ae17f6760e1a09ca4c6253ac6a3e5106fc170f33..c138450a20ce0ee01e5f552c78296a780f5c10b7 100644 (file)
--- a/lib/redcloth3.rb
+++ b/lib/redcloth3.rb
@@ -791,7 +791,10 @@ class RedCloth3 < String
             \s?
             (?:\(([^)]+?)\)(?="))?     # $title
             ":
-            ([\w\/]\S+?)               # $url
+            (                          # $url
+            (\/|https?:\/\/|s?ftps?:\/\/|www\.)
+            [\w\/]\S+?
+            )               
             (\/)?                      # $slash
             ([^\w\=\/;\(\)]*?)         # $post
             (?=<|\s|$)
@@ -799,7 +802,7 @@ class RedCloth3 < String
 #"
     def inline_textile_link( text ) 
         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 )
             title ||= url_title