diff --git a/upload/config.php b/upload/config.php
index 25c48226a..43217e58f 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r79';
+$bb_cfg['tp_release_state'] = 'TP II r80';
 $bb_cfg['tp_release_date'] = '05-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php
index 74143c75c..e7b11a699 100644
--- a/upload/includes/bbcode.php
+++ b/upload/includes/bbcode.php
@@ -773,11 +773,8 @@ class bbcode
 
 		$url_regexp = array();
 		$url_regexp[] = "#\[url\]([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu";
-		$url_regexp[] = "#\[url\]((www|ftp)\.[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)\[/url\]#isu";
 		$url_regexp[] = "#\[url=([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#isu";
-		$url_regexp[] = "#\[url=((www|ftp)\.[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#isu";
-		$url_regexp[] = "#\[url=([\w]+?://[\w\#$%&~/.\-;:=,?@а-яА-Я\[\]+]*?(jpg|jpeg|gif|png))\]([^?\n\r\t].*?)\[/url\]#isu";
-		$url_regexp[] = "#(?<![\"'=])\b([https://|ftp://|www\.|ftp\.][\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+)(?![\"']|\[/url|\[/img|</a)(?=[,!]?\s|[\)<!])#xius";
+		$url_regexp[] = "#(?<![\"'=])\b([\w]+?://[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?)(?![\"']|\[/url|\[/img|</a)(?=[,!]?\s|[\)<!])#isu";
 
 		// pad it with a space so we can match things at the start of the 1st line.
 		$ret = " $text ";
@@ -803,9 +800,9 @@ class bbcode
 
 		$max_len = 70;
 		$href    = $m[1];
-		$name = empty($m[2]) ? $href : $m[2];
+		$name    = empty($m[2]) ? $href : $m[2];
 
-		if(mb_strlen($name, 'UTF-8'))
+		if(mb_strlen($name, 'UTF-8') > $max_len)
 		{
 			$name = mb_substr($name, 0, $max_len - 19, 'UTF-8') .'...'. mb_substr($name, -16, 'UTF-8');
 		}