diff --git a/library/includes/functions.php b/library/includes/functions.php index 00bc4e62c..5d600a619 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -2076,5 +2076,5 @@ function user_birthday_icon($user_birthday, $user_id): string $user_birthday = ($user_id != GUEST_UID && !empty($user_birthday) && $user_birthday != '1900-01-01') ? bb_date(strtotime($user_birthday), 'md', false) : false; - return ($bb_cfg['birthday_enabled'] && $current_date == $user_birthday) ? '' : ''; + return ($bb_cfg['birthday_enabled'] && $current_date == $user_birthday) ? '' . $lang['HAPPY_BIRTHDAY'] . '' : ''; } diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index 2f604120c..06d1d1d9e 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -380,10 +380,11 @@ function build_poll_add_form (src_el)

{MINIPOST_IMG_NEW}{MINIPOST_IMG} - {postrow.POST_DATE} + {postrow.POST_DATE} | #{postrow.POST_NUMBER} ({L_POSTED_AFTER} {postrow.POSTED_AFTER}) + · {L_AUTHOR}

diff --git a/viewtopic.php b/viewtopic.php index 295f68672..7ed853b70 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -573,10 +573,11 @@ for ($i = 0; $i < $total_posts; $i++) { $mc_comment = $postrow[$i]['mc_comment']; $mc_user_id = profile_url(['username' => $postrow[$i]['mc_username'], 'user_id' => $postrow[$i]['mc_user_id'], 'user_rank' => $postrow[$i]['mc_user_rank']]); - $rg_id = ($postrow[$i]['poster_rg_id']) ?: 0; + $rg_id = $postrow[$i]['poster_rg_id'] ?: 0; $rg_avatar = get_avatar(GROUP_AVATAR_MASK . $rg_id, $postrow[$i]['rg_avatar_id']); - $rg_name = ($postrow[$i]['group_name']) ? htmlCHR($postrow[$i]['group_name']) : ''; - $rg_signature = ($postrow[$i]['group_signature']) ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : ''; + $rg_name = $postrow[$i]['group_name'] ? htmlCHR($postrow[$i]['group_name']) : ''; + $rg_desc = $postrow[$i]['group_description'] ? bbcode2html(htmlCHR($postrow[$i]['group_description'])) : ''; + $rg_signature = $postrow[$i]['group_signature'] ? bbcode2html(htmlCHR($postrow[$i]['group_signature'])) : ''; $poster_avatar = ''; if (!$user->opt_js['h_av'] && $poster_id != GUEST_UID) { @@ -587,7 +588,7 @@ for ($i = 0; $i < $total_posts; $i++) { $user_rank = $postrow[$i]['user_rank']; if (!$user->opt_js['h_rnk_i'] and isset($ranks[$user_rank])) { $rank_image = ($bb_cfg['show_rank_image'] && $ranks[$user_rank]['rank_image']) ? '' : ''; - $poster_rank = ($bb_cfg['show_rank_text']) ? $ranks[$user_rank]['rank_title'] : ''; + $poster_rank = $bb_cfg['show_rank_text'] ? $ranks[$user_rank]['rank_title'] : ''; } // Handle anon users posting with usernames @@ -731,6 +732,7 @@ for ($i = 0; $i < $total_posts; $i++) { 'RG_AVATAR' => $rg_avatar, 'RG_NAME' => $rg_name, + 'RG_DESC' => $rg_desc, 'RG_URL' => GROUP_URL . $rg_id, 'RG_FIND_URL' => 'tracker.php?srg=' . $rg_id, 'RG_SIG' => $rg_signature,