From 1bad4a08f04e0dc0416c3d1bf113a30c0683c7c0 Mon Sep 17 00:00:00 2001 From: nanosimbiot Date: Sun, 21 Aug 2011 16:28:31 +0000 Subject: [PATCH] r239 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Стабильная версия git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@239 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/config.php | 4 ++-- upload/viewforum.php | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/upload/config.php b/upload/config.php index 1786a5b1b..781e9d669 100644 --- a/upload/config.php +++ b/upload/config.php @@ -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 diff --git a/upload/viewforum.php b/upload/viewforum.php index 42d1bba12..7f63693e4 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 + 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 .= '
'; - $last_post .= ($sf_data['sf_last_user_id'] != ANONYMOUS) ? ''. $last_post_username .'' : $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 .= 'latest'; }