From 225883d185892437692f959077862325e66c3044 Mon Sep 17 00:00:00 2001 From: pherum83 Date: Sun, 20 Nov 2011 21:47:46 +0000 Subject: [PATCH] r327 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit к r326 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@327 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/attach_mod/displaying_torrent.php | 2 +- upload/config.php | 6 +++--- upload/includes/init_bb.php | 1 - upload/tracker.php | 2 +- upload/viewforum.php | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index a04f93a46..40ac04c90 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -211,7 +211,7 @@ if ($tor_reged && $tor_info) 'DOWNLOAD_NAME' => $display_name, 'TRACKER_LINK' => $tracker_link, 'ATTACH_ID' => $attach_id, - 'TOR_FROZEN' => isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]), + 'TOR_FROZEN' => (!IS_AM) ? isset($bb_cfg['tor_frozen'][$tor_info['tor_status']]) : '', 'TOR_SILVER_GOLD' => $tor_type, // torrent status mod diff --git a/upload/config.php b/upload/config.php index b45c18850..afd0bd927 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.2 Beta'; -$bb_cfg['tp_release_state'] = 'R326'; -$bb_cfg['tp_release_date'] = '20-11-2011'; +$bb_cfg['tp_release_state'] = 'R327'; +$bb_cfg['tp_release_date'] = '21-11-2011'; // Database $charset = 'utf8'; @@ -411,7 +411,7 @@ $bb_cfg['show_poster_joined'] = true; $bb_cfg['show_poster_posts'] = true; $bb_cfg['show_poster_from'] = true; $bb_cfg['show_bot_nick'] = false; -$bb_cfg['text_buttons'] = false; // replace EDIT, QUOTE... images with text links +$bb_cfg['text_buttons'] = true; // replace EDIT, QUOTE... images with text links $bb_cfg['parse_ed2k_links'] = true; // make ed2k links clickable $bb_cfg['post_date_format'] = 'd-M-Y H:i'; $bb_cfg['ext_link_new_win'] = true; // open external links in new window diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index ebdddf767..a6c019ec1 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -305,7 +305,6 @@ $bb_cfg['tor_icons'] = array( ); // Запрет на скачивание -if (!IS_AM) $bb_cfg['tor_frozen'] = array( TOR_CHECKING => true, TOR_CLOSED => true, diff --git a/upload/tracker.php b/upload/tracker.php index 70b9b67e9..d7a1460ae 100644 --- a/upload/tracker.php +++ b/upload/tracker.php @@ -769,7 +769,7 @@ if ($allowed_forums) 'MAGNET' => $tor_magnet, 'TOR_TYPE' => $is_gold, - 'TOR_FROZEN' => isset($bb_cfg['tor_frozen'][$tor['tor_status']]), + 'TOR_FROZEN' => (!IS_AM) ? isset($bb_cfg['tor_frozen'][$tor['tor_status']]) : '', 'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor['tor_status']], 'TOR_STATUS_TEXT' => $lang['TOR_STATUS_NAME'][$tor['tor_status']], diff --git a/upload/viewforum.php b/upload/viewforum.php index 917dee513..09047481d 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -505,7 +505,7 @@ foreach ($topic_rowset as $topic) 'REPLIES' => $replies, 'VIEWS' => $topic['topic_views'], 'TOR_STALED' => ($forum_data['allow_reg_tracker'] && !($t_type == POST_ANNOUNCE || $t_type == POST_STICKY || $topic['tor_size'])), - 'TOR_FROZEN' => isset($topic['tor_status']) ? isset($bb_cfg['tor_frozen'][$topic['tor_status']]) : '', + 'TOR_FROZEN' => isset($topic['tor_status']) ? ((!IS_AM) ? isset($bb_cfg['tor_frozen'][$topic['tor_status']]) : '') : '', 'TOR_TYPE' => $is_gold, 'TOR_STATUS_ICON' => isset($topic['tor_status']) ? $bb_cfg['tor_icons'][$topic['tor_status']] : '',