Ticket #2889: functions-formatting.php.diff

functions-formatting.php

@@ -501 +501 @@
         return $newtext;
 }
 
-function force_balance_tags($text) {
-        return balanceTags($text, 0, true);
-}
 
 function format_to_edit($content, $richedit = false) {
         $content = apply_filters('format_to_edit', $content);
@@ -575 +572 @@
 
 function make_clickable($ret) {
         $ret = ' ' . $ret . ' ';
-        $ret = preg_replace("#([\s>])(https?)://([^\s<>{}()]+[^\s.,<>{}()])#i", "$1<a href='$2://$3' rel='nofollow'>$2://$3</a>", $ret);
+        $ret = preg_replace("#([\s>])(https?)://([^\s<>{}()]+[^\s.,<>{}()])#i", "$1$2://$3", $ret);
         $ret = preg_replace("#(\s)www\.([a-z0-9\-]+)\.([a-z0-9\-.\~]+)((?:/[^ <>{}()\n\r]*[^., <>{}()\n\r]?)?)#i", "$1<a href='http://www.$2.$3$4' rel='nofollow'>www.$2.$3$4</a>", $ret);
         $ret = preg_replace("#(\s)([a-z0-9\-_.]+)@([a-z0-9\-_.]+)\.([^,< \n\r]+)#i", "$1<a href=\"mailto:$2@$3.$4\">$2@$3.$4</a>", $ret);
         $ret = trim($ret);