allow <> to surround the url (like () or [])

This commit is contained in:
Craig Andrews 2009-11-02 12:57:51 -05:00
parent 8b7bce12f8
commit 1cf67f4f71

View File

@ -422,7 +422,7 @@ function common_render_text($text)
function common_replace_urls_callback($text, $callback, $notice_id = null) { function common_replace_urls_callback($text, $callback, $notice_id = null) {
// Start off with a regex // Start off with a regex
$regex = '#'. $regex = '#'.
'(?:^|[\s\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'. '(?:^|[\s\<\>\(\)\[\]\{\}\\\'\\\";]+)(?![\@\!\#])'.
'('. '('.
'(?:'. '(?:'.
'(?:'. //Known protocols '(?:'. //Known protocols
@ -480,6 +480,10 @@ function callback_helper($matches, $callback, $notice_id) {
array( array(
'left'=>'{', 'left'=>'{',
'right'=>'}' 'right'=>'}'
),
array(
'left'=>'<',
'right'=>'>'
) )
); );
$cannotEndWith=array('.','?',',','#'); $cannotEndWith=array('.','?',',','#');