diff --git a/upload/config.php b/upload/config.php index fcdb22cb8..25c48226a 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 r78'; +$bb_cfg['tp_release_state'] = 'TP II r79'; $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 1c71b948f..74143c75c 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -507,7 +507,7 @@ class bbcode var $smilies = null; // смайлы var $found_spam = null; // найденные спам "слова" var $del_words = array(); // см. get_words_rate() - var $tidy_cfg = array( + var $tidy_cfg = array( 'drop-empty-paras' => false, 'fix-uri' => false, 'force-output' => true, @@ -669,7 +669,7 @@ class bbcode { $text = trim($text); $text = str_replace("\r", '', $text); - $text = preg_replace('#[ \t]+$#m', '', $text); // trailing spaces + $text = preg_replace('#[ \t]+$#m', '', $text); // trailing spaces $text = preg_replace('#\n{3,}#', "\n\n", $text); return $text; } @@ -771,7 +771,7 @@ class bbcode { global $bb_cfg; - $url_regexp = array(); + $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"; @@ -807,15 +807,15 @@ class bbcode if(mb_strlen($name, 'UTF-8')) { - $anme = mb_substr($name, 0, $max_len - 19, 'UTF-8') .'...'. mb_substr($name, -16, 'UTF-8'); + $name = mb_substr($name, 0, $max_len - 19, 'UTF-8') .'...'. mb_substr($name, -16, 'UTF-8'); } - if(!preg_match("#{$bb_cfg['server_name']}#", $href)) - { - require_once(INC_DIR .'class.idna_convert.php'); - $IDN = new idna_convert(); - return ''. $name .''; - } + if(!preg_match("#{$bb_cfg['server_name']}#", $href)) + { + require_once(INC_DIR .'class.idna_convert.php'); + $IDN = new idna_convert(); + return ''. $name .''; + } return "$name"; }