diff --git a/upload/config.php b/upload/config.php index 12867afdf..fcdb22cb8 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 r77'; +$bb_cfg['tp_release_state'] = 'TP II r78'; $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 7bcce2a7a..1c71b948f 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -14,22 +14,13 @@ $page_cfg['include_bbcode_js'] = true; function get_bbcode_tpl () { $bbcode_tpl = array(); + // Quote -/* -
-
Цитата:
-
-*/ $bbcode_tpl['quote_open'] = <<
HTML; -/* -
-
\\1 писал(а):
-
-*/ $bbcode_tpl['quote_username_open'] = <<
@@ -53,21 +44,11 @@ $bbcode_tpl['code_close'] = << -
скрытый текст
-
-*/ $bbcode_tpl['spoiler_open'] = <<
HTML; -/* -
-
\\1
-
-*/ $bbcode_tpl['spoiler_title_open'] = <<
@@ -80,7 +61,9 @@ $bbcode_tpl['spoiler_close'] = << +HTML; $bbcode_tpl['img_aligned'] = << @@ -520,10 +503,10 @@ function add_search_words ($post_id, $post_message, $post_title = '', $only_retu class bbcode { - var $tpl = array(); // шаблоны для замены тегов - var $smilies = null; - var $found_spam = null; // найденные спам "слова" - var $del_words = array(); // см. get_words_rate() + var $tpl = array(); // шаблоны для замены тегов + var $smilies = null; // смайлы + var $found_spam = null; // найденные спам "слова" + var $del_words = array(); // см. get_words_rate() var $tidy_cfg = array( 'drop-empty-paras' => false, 'fix-uri' => false, @@ -532,7 +515,7 @@ class bbcode 'join-classes' => false, 'join-styles' => false, 'merge-divs' => false, -# 'merge-spans' => false, // нужно будет включить после обновления версии tidy + 'merge-spans' => false, 'newline' => 'LF', 'output-xhtml' => true, 'preserve-entities' => true, @@ -542,7 +525,7 @@ class bbcode 'show-errors' => false, 'show-warnings' => false, 'wrap' => 0, - ); + ); var $block_tags = array( 'align', 'br', @@ -552,7 +535,7 @@ class bbcode 'pre', 'quote', 'spoiler', - ); + ); var $preg = array(); var $str = array(); var $preg_search = array(); @@ -584,7 +567,6 @@ class bbcode { $tpl = $this->tpl; $img_url_exp = 'http://[^\s\?&;:=\#\"<>]+?\.(jpg|jpeg|gif|png)'; - $email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+'; $this->preg = array( @@ -618,7 +600,7 @@ class bbcode '[/font]' => '', '[tab]' => ' ', '[br]' => "\n\n", - '[hr]' => $tpl['hr'], # $('.post-hr').html('
'); + '[hr]' => $tpl['hr'], '[b]' => '', '[/b]' => '', '[u]' => '',