Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed trailing .) from the URL in make_clickable() 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-08-19 23:56:10 +00:00
parent 6a6257ee42
commit 668cfea9f2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/formatting.php
View File

@ -1185,10 +1185,18 @@ function antispambot($emailaddy, $mailto=0) {
*/
function _make_url_clickable_cb($matches) {
$url = $matches[2];
$after = '';
if ( preg_match( '|(.+)([).])$|', $url, $split ) ) {
$url = $split[1];
$after = $split[2];
}
$url = esc_url($url);
if ( empty($url) )
return $matches[0];
return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>$after";
}
/**
@ -1210,12 +1218,13 @@ function _make_web_ftp_clickable_cb($matches) {
$dest = esc_url($dest);
if ( empty($dest) )
return $matches[0];
// removed trailing [,;:] from URL
if ( in_array(substr($dest, -1), array('.', ',', ';', ':')) === true ) {
// removed trailing [.,;:)] from URL
if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
$ret = substr($dest, -1);
$dest = substr($dest, 0, strlen($dest)-1);
}
return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>" . $ret;
return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
}
/**