Стабильная версия git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@239 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-08-21 16:28:31 +00:00
commit 1bad4a08f0
2 changed files with 4 additions and 6 deletions

View file

@ -56,8 +56,8 @@ $bb_cfg['js_ver'] = 1;
$bb_cfg['css_ver'] = 1;
// Increase number of revision after update
$bb_cfg['tp_version'] = '2.1 Beta';
$bb_cfg['tp_release_state'] = 'R238';
$bb_cfg['tp_version'] = '2.1 Stable';
$bb_cfg['tp_release_state'] = 'R239';
$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

View file

@ -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
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)
@ -188,13 +188,11 @@ if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums'])
$folder_image = $images['forum_new'];
}
$last_post_username = ($sf_data['sf_last_username']) ? $sf_data['sf_last_username'] : $lang['GUEST'];
if ($sf_data['forum_last_post_id'])
{
$last_post = bb_date($sf_data['topic_last_post_time'], $bb_cfg['last_post_date_format']);
$last_post .= '<br />';
$last_post .= ($sf_data['sf_last_user_id'] != ANONYMOUS) ? '<a href="'. PROFILE_URL . $sf_data['sf_last_user_id'] .'">'. $last_post_username .'</a>' : $last_post_username;
$last_post .= profile_url(array('username' => $sf_data['sf_last_username'], 'user_id' => $sf_data['sf_last_user_id'], 'user_rank' => $sf_data['user_rank']));
$last_post .= '<a href="'. POST_URL . $sf_data['forum_last_post_id'] .'#'. $sf_data['forum_last_post_id'] .'"><img src="'. $images['icon_latest_reply'] .'" class="icon2" alt="latest" title="'. $lang['VIEW_LATEST_POST'] .'" /></a>';
}