diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php
index 06a2a3f5e8..4b3ca708d3 100644
--- a/wp-includes/functions-formatting.php
+++ b/wp-includes/functions-formatting.php
@@ -326,15 +326,13 @@ function antispambot($emailaddy, $mailto=0) {
return $emailNOSPAMaddy;
}
-function make_clickable($text) { // original function: phpBB, extended here for AIM & ICQ
- $ret = " " . $text;
- $ret = preg_replace("#([\n ])([a-z]+?)://([^, <>{}\n\r]+)#i", "\\1\\2://\\3", $ret);
- $ret = preg_replace("#([\n ])aim:([^,< \n\r]+)#i", "\\1\\2\\3", $ret);
- $ret = preg_replace("#([\n ])icq:([^,< \n\r]+)#i", "\\1\\2\\3", $ret);
- $ret = preg_replace("#([\n ])www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^,< \n\r]*)?)#i", "\\1www.\\2.\\3\\4", $ret);
- $ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([^,< \n\r]+)#i", "\\1\\2@\\3", $ret);
- $ret = substr($ret, 1);
- return $ret;
+function make_clickable($ret) { // original function: phpBB
+ $ret = ' ' . $ret . ' ';
+ $ret = preg_replace("#(\s)http://([^\s<>{}()]+[^\s.,<>{}()])#i", "$1http://$2", $ret);
+ $ret = preg_replace("#(\s)www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^ <>{}()\n\r]*[^., <>{}()\n\r]?)?)#i", "$1www.$2.$3$4", $ret);
+ $ret = preg_replace("#(\s)([a-z0-9\-_.]+)@([^,< \n\r]+)#i", "$1