Ensure that make_clickable links correctly when the link is placed in brackets and has trailing punctuation. Fixes #11211 props filosofo.
git-svn-id: https://develop.svn.wordpress.org/trunk@12250 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
b15bee6f1a
commit
69422cfa9c
@ -1331,7 +1331,7 @@ function _make_email_clickable_cb($matches) {
|
|||||||
function make_clickable($ret) {
|
function make_clickable($ret) {
|
||||||
$ret = ' ' . $ret;
|
$ret = ' ' . $ret;
|
||||||
// in testing, using arrays here was found to be faster
|
// in testing, using arrays here was found to be faster
|
||||||
$ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/=?@\[\](+-]|[.,;:](?![\s<]|(\))?([\s]|$))|(?(1)\)(?![\s<]|$)|\)))+)#is', '_make_url_clickable_cb', $ret);
|
$ret = preg_replace_callback('#(?<=[\s>])(\()?([\w]+?://(?:[\w\\x80-\\xff\#$%&~/=?@\[\](+-]|[.,;:](?![\s<]|(\))?([\s]|$))|(?(1)\)(?![\s<.,;:]|$)|\)))+)#is', '_make_url_clickable_cb', $ret);
|
||||||
$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
|
$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
|
||||||
$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
|
$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
|
||||||
// this one is not in an array because we need it to run last, for cleanup of accidental links within links
|
// this one is not in an array because we need it to run last, for cleanup of accidental links within links
|
||||||
|
Loading…
x
Reference in New Issue
Block a user