diff --git a/upload/admin/admin_ranks.php b/upload/admin/admin_ranks.php index 62880cb37..ab90961d3 100644 --- a/upload/admin/admin_ranks.php +++ b/upload/admin/admin_ranks.php @@ -82,7 +82,7 @@ if($mode != "") "RANK" => !empty($rank_info['rank_title']) ? $rank_info['rank_title'] : '', "SPECIAL_RANK" => $rank_is_special, "NOT_SPECIAL_RANK" => $rank_is_not_special, - "MINIMUM" => ($rank_is_special) ? "" : $rank_info['rank_min'], + "MINIMUM" => ($rank_is_special) ? "" : @$rank_info['rank_min'], "IMAGE" => !empty($rank_info['rank_image']) ? $rank_info['rank_image'] : "images/ranks/rank_image.gif", "STYLE" => !empty($rank_info['rank_style']) ? $rank_info['rank_style'] : '', "IMAGE_DISPLAY" => !empty($rank_info['rank_image']) ? '' : "", diff --git a/upload/config.php b/upload/config.php index 150c06960..bffdd0d0a 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.1 Stable'; -$bb_cfg['tp_release_state'] = 'R240'; +$bb_cfg['tp_release_state'] = 'R241'; $bb_cfg['tp_release_date'] = '22-08-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/templates/default/posting_editor.tpl b/upload/templates/default/posting_editor.tpl index 77357e64b..f404477aa 100644 --- a/upload/templates/default/posting_editor.tpl +++ b/upload/templates/default/posting_editor.tpl @@ -171,14 +171,12 @@ function debounce (el_id, time_ms) } } -$(document).ready(function(){ - $('#post-submit-btn').click(function(event){ - $('#post-submit-btn').after(''); - }); - $('#post-js-warn').hide(); - $('#post-buttons-block').show(); - $('#post-submit-btn').attr('disabled', 0); +$('#post-submit-btn').click(function(event){ + $('#post-submit-btn').after(''); }); +$('#post-js-warn').hide(); +$('#post-buttons-block').show(); +$('#post-submit-btn').attr('disabled', 0); // Called before form submitting. var submitted = false; diff --git a/upload/viewforum.php b/upload/viewforum.php index 7f63693e4..a0e470b69 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -146,7 +146,7 @@ if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums']) SELECT f.forum_id, f.forum_status, f.forum_last_post_id, f.forum_posts, f.forum_topics, t.topic_last_post_time, t.topic_id AS last_topic_id, t.topic_title AS last_topic_title, - p.poster_id AS sf_last_user_id, IF(p.poster_id = $anon, p.post_username, u.username) AS sf_last_username. u.user_rank + p.poster_id AS sf_last_user_id, IF(p.poster_id = $anon, p.post_username, u.username) AS sf_last_username, u.user_rank FROM ". BB_FORUMS ." f LEFT JOIN ". BB_TOPICS ." t ON(f.forum_last_post_id = t.topic_last_post_id) LEFT JOIN ". BB_POSTS ." p ON(f.forum_last_post_id = p.post_id)