diff --git a/upload/config.php b/upload/config.php index edf3d27cd..9c7f5799f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -63,8 +63,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R338'; -$bb_cfg['tp_release_date'] = '20-12-2011'; +$bb_cfg['tp_release_state'] = 'R339'; +$bb_cfg['tp_release_date'] = '21-12-2011'; // Database $charset = 'utf8'; diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index eb1a7afa0..5667eb6d6 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -486,7 +486,7 @@ class bbcode function init_replacements () { $tpl = $this->tpl; - $img_url_exp = 'http://[^\s\?&;:=\#\"<>]+?\.(jpg|jpeg|gif|png)'; + $img_url_exp = 'http://[^\s\?&;=\#\"<>]+?\.(jpg|jpeg|gif|png)'; $email_exp = '[a-z0-9&\-_.]+?@[\w\-]+\.([\w\-\.]+\.)?[\w]+'; $url_exp = '[\w\#!$%&~/.\-;:=,?@а-яА-Я\[\]+]+?'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 31805a3c0..afe83393a 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1274,7 +1274,7 @@ $lang['SILVER_STATUS'] = 'СЕРЕБРЯНАЯ РАЗДАЧА! СКАЧАННО $lang['SEARCH_IN_FORUMS'] = 'Искать в форумах'; $lang['SELECT_CAT'] = 'Выбрать категорию…'; $lang['GO_TO_SECTION'] = 'перейти к разделу'; -$lang['TORRENTS_FROM'] = 'Торенты за'; +$lang['TORRENTS_FROM'] = 'Торренты за'; $lang['SHOW_ONLY'] = 'Показывать только'; $lang['SHOW_COLUMN'] = 'Показывать колонку'; diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index 1925fa953..48d7ff3e0 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -155,7 +155,7 @@ {postrow.attach.tor_not_reged.DOWNLOAD_NAME} - {L_TRACKER}: + {L_TORRENT}: {postrow.attach.tor_not_reged.TRACKER_LINK}

{postrow.attach.tor_not_reged.S_UPLOAD_IMAGE}