Commit 1fa1aa54 authored by Albert Ting's avatar Albert Ting Committed by David Lawrence

Bug 1061226: markdown isn't linkifying urls

r=dkl,a=glob
parent 1fbcede2
...@@ -237,7 +237,7 @@ sub _DoAnchors { ...@@ -237,7 +237,7 @@ sub _DoAnchors {
}xsge; }xsge;
# #
# Last, handle reference-style shortcuts: [link text] # Handle reference-style shortcuts: [link text]
# These must come last in case you've also got [link test][1] # These must come last in case you've also got [link test][1]
# or [link test](/foo) # or [link test](/foo)
# #
...@@ -256,6 +256,22 @@ sub _DoAnchors { ...@@ -256,6 +256,22 @@ sub _DoAnchors {
$self->_GenerateAnchor($whole_match, $link_text, $link_id); $self->_GenerateAnchor($whole_match, $link_text, $link_id);
}xsge; }xsge;
# Last, handle "naked" references
# Caveat, does not handle ;http://amazon.com
my $safe_url_regexp = Bugzilla::Template::SAFE_URL_REGEXP();
$text =~ s{
(
(^|(?<![;^"'<>])) # negative lookbehind, including ';' in '&lt;'
( # wrap url in $3
(?:https?|ftp):[^'">\s]+\w
)
)
}{
my $whole_match = $3;
my $url = $whole_match;
$self->_GenerateAnchor($whole_match, $url, undef, $url, undef);
}xsge;
return $text; return $text;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment