From a94c50f2794fe6557e2d30f6c8bad67cb547ce18 Mon Sep 17 00:00:00 2001 From: "gemini_13@torba.su" Date: Thu, 30 May 2013 20:18:16 +0000 Subject: [PATCH] r505 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit За идею спасибо JDVU За баг спасибо druid git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@505 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/attach_mod/displaying_torrent.php | 2 +- upload/config.php | 4 ++-- upload/includes/init_bb.php | 8 ++++++++ upload/posting.php | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index ffc0e8fec..781828ce2 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -589,7 +589,7 @@ if ($bb_cfg['bt_allow_spmode_change'] && $s_mode != 'full') $template->assign_vars(array( 'SHOW_DL_LIST_LINK' => (($bb_cfg['bt_show_dl_list'] || $bb_cfg['allow_dl_list_names_mode']) && $t_data['topic_dl_type'] == TOPIC_DL_TYPE_DL), - 'SHOW_TOR_ACT' => ($tor_reged && $show_peers), + 'SHOW_TOR_ACT' => ($tor_reged && $show_peers && (!isset($bb_cfg['tor_no_tor_act'][$tor_info['tor_status']]) || IS_AM)), 'S_MODE_COUNT' => ($s_mode == 'count'), 'S_MODE_NAMES' => ($s_mode == 'names'), 'S_MODE_FULL' => ($s_mode == 'full'), diff --git a/upload/config.php b/upload/config.php index 58722df20..812e9f96f 100644 --- a/upload/config.php +++ b/upload/config.php @@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do // Increase number of revision after update $bb_cfg['tp_version'] = '2.5 pre-stable'; -$bb_cfg['tp_release_date'] = '27-05-2013'; -$bb_cfg['tp_release_state'] = 'R504'; +$bb_cfg['tp_release_date'] = '30-05-2013'; +$bb_cfg['tp_release_state'] = 'R505'; // Database $charset = 'utf8'; diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 3cbc58ab7..432fccc3f 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -337,6 +337,14 @@ $bb_cfg['tor_cannot_new'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL); // Разрешение на ответ релизера, если раздача исправлена. $bb_cfg['tor_reply'] = array(TOR_NEED_EDIT, TOR_NO_DESC, TOR_DOUBTFUL); +// Если такой статус у релиза, то статистика раздачи будет скрыта +$bb_cfg['tor_no_tor_act'] = array( + TOR_CLOSED => true, + TOR_DUP => true, + TOR_CLOSED_CPHOLD => true, + TOR_CONSUMED => true, +); + // Table names define('BUF_TOPIC_VIEW', 'buf_topic_view'); define('BUF_LAST_SEEDER', 'buf_last_seeder'); diff --git a/upload/posting.php b/upload/posting.php index eeb161dc4..9e5fedde3 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -534,11 +534,11 @@ else if ( ($submit || $confirm) && !$topic_has_new_posts ) { if ($to_draft) { - update_draft('is_draft', $forum_id, $topic_id, $post_id, $post_data['poster_id']); + update_draft('is_draft', $forum_id, $topic_id, $post_info['topic_dl_type'], $post_id, $post_data['poster_id']); } else { - update_draft('no_draft', $forum_id, $topic_id, $post_id, $post_data['poster_id']); + update_draft('no_draft', $forum_id, $topic_id, $post_info['topic_dl_type'], $post_id, $post_data['poster_id']); } } }