summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/redcloth3.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/redcloth3.rb b/lib/redcloth3.rb
index ae17f6760..c138450a2 100644
--- 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