From 4f3e62b4a13d116b76c38045255aaa7e0293cf98 Mon Sep 17 00:00:00 2001 From: "gemini_13@torba.su" Date: Fri, 24 May 2013 13:05:39 +0000 Subject: [PATCH] r503 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit За найденныйе баги спасибо JDVU git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@503 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 ++-- upload/includes/functions_post.php | 7 ++++--- upload/includes/ucp/usercp_viewdraft.php | 2 +- upload/language/lang_english/lang_main.php | 1 + upload/language/lang_russian/lang_main.php | 1 + upload/posting.php | 4 ++-- upload/search.php | 2 +- upload/templates/default/page_header.tpl | 2 +- 8 files changed, 13 insertions(+), 10 deletions(-) diff --git a/upload/config.php b/upload/config.php index 64c992c0a..299e06481 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'] = '22-05-2013'; -$bb_cfg['tp_release_state'] = 'R501'; +$bb_cfg['tp_release_date'] = '24-05-2013'; +$bb_cfg['tp_release_state'] = 'R503'; // Database $charset = 'utf8'; diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php index 406dbd6eb..f8f5d3131 100644 --- a/upload/includes/functions_post.php +++ b/upload/includes/functions_post.php @@ -320,6 +320,7 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ // function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $user_id) { + $to_draft = (isset($post_data['to_draft'])) ? $post_data['to_draft'] : 0; $sign = ($mode == 'delete') ? '- 1' : '+ 1'; $forum_update_sql = "forum_posts = forum_posts $sign"; $topic_update_sql = ''; @@ -388,7 +389,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u } else if ($mode != 'poll_delete') { - if (!$post_data['to_draft']) + if (!$to_draft) { $forum_update_sql .= ", forum_last_post_id = $post_id" . (($mode == 'newtopic') ? ", forum_topics = forum_topics $sign" : ""); } @@ -399,7 +400,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u $topic_update_sql .= 'topic_vote = 0'; } - if (!$post_data['to_draft']) + if (!$to_draft) { $sql = "UPDATE " . BB_FORUMS . " SET $forum_update_sql @@ -421,7 +422,7 @@ function update_post_stats($mode, $post_data, $forum_id, $topic_id, $post_id, $u } } - if ($mode != 'poll_delete' || $post_data['to_draft']) + if ($mode != 'poll_delete' || $to_draft) { $sql = "SELECT forum_postcount FROM " . BB_FORUMS . " diff --git a/upload/includes/ucp/usercp_viewdraft.php b/upload/includes/ucp/usercp_viewdraft.php index f1602398f..53dc1d4b1 100644 --- a/upload/includes/ucp/usercp_viewdraft.php +++ b/upload/includes/ucp/usercp_viewdraft.php @@ -22,7 +22,7 @@ $sql = " if(!$rows = DB()->fetch_rowset($sql)) { - bb_die('Список черновиков пуст

'. $lang['RETURN_PROFILE'] .'

'. sprintf($lang['CLICK_RETURN_INDEX'], '', '')); + bb_die($lang['NO_DRAFTS'] . '

'. $lang['RETURN_PROFILE'] .'

'. sprintf($lang['CLICK_RETURN_INDEX'], '', '')); } $i = 0; diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index b6546b4ed..9e0ad8268 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -386,6 +386,7 @@ $lang['TO_DRAFT'] = 'Save as Draft'; $lang['DRAFTS'] = 'Drafts'; $lang['CANNOT_DELETE_DRAFT'] = 'Sorry, but you may not delete other user\'s drafts'; $lang['CANNOT_VIEW_DRAFT'] = 'Sorry, but you may not view other user\'s drafts'; +$lang['NO_DRAFTS'] = 'The draft list is empty'; $lang['STORED'] = 'Your message has been entered successfully.'; $lang['DELETED'] = 'Your message has been deleted successfully.'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 2b4728e40..2ebe862b8 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -388,6 +388,7 @@ $lang['TO_DRAFT'] = 'Сохранить как черновик'; $lang['DRAFTS'] = 'Черновиков'; $lang['CANNOT_DELETE_DRAFT'] = 'Извините, вы не можете удалять чужие черновики'; $lang['CANNOT_VIEW_DRAFT'] = 'Извините, вы не можете просматривать чужие черновики'; +$lang['NO_DRAFTS'] = 'Список черновиков пуст'; $lang['STORED'] = 'Ваше сообщение было успешно добавлено'; $lang['DELETED'] = 'Ваше сообщение было успешно удалено'; diff --git a/upload/posting.php b/upload/posting.php index a94ba7dad..eeb161dc4 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -321,12 +321,12 @@ if ($mode == 'newtopic' && $topic_tpl && $post_info['topic_tpl_id']) if ($submit || $refresh) { $notify_user = (int) !empty($_POST['notify']); - $to_draft = (int) !empty($_POST['to_draft']); + $to_draft = ($post_data['first_post']) ? (int) !empty($_POST['to_draft']) : 0; } else { $notify_user = bf($userdata['user_opt'], 'user_opt', 'notify'); - $to_draft = ($mode == 'editpost') ? $post_info['is_draft'] : false; + $to_draft = ($mode == 'editpost') ? $post_info['is_draft'] : 0; if (!IS_GUEST && $mode != 'newtopic' && !$notify_user) { diff --git a/upload/search.php b/upload/search.php index 48178a956..6443e4dee 100644 --- a/upload/search.php +++ b/upload/search.php @@ -648,7 +648,7 @@ else } // FROM - if ($join_t || $bb_cfg['status_of_draft']) $SQL['FROM'][] = $topics_tbl; + if ($join_t) $SQL['FROM'][] = $topics_tbl; if ($join_p) $SQL['FROM'][] = $posts_tbl; if (!$SQL['FROM']) diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 7278f711b..d0baa28ea 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -465,7 +465,7 @@ $(document).ready(function() { {L_SEARCH_DL_COMPLETE_DOWNLOADS} {L_SEARCH_DL_WILL_DOWNLOADS} {L_WATCHED_TOPICS} - {L_DRAFTS} + {L_DRAFTS}