diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 99adf6f6a7..fbb6d65b92 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -397,11 +397,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if ($row['forum_last_post_id'])
{
$last_post_subject = $row['forum_last_post_subject'];
- if (utf8_strlen(htmlspecialchars_decode($last_post_subject)) > 30)
- {
- $last_post_subject = htmlspecialchars(utf8_substr(htmlspecialchars_decode($last_post_subject, 0, 30)));
- $last_post_subject .= '...';
- }
+ $last_post_subject_truncated = truncate_string($last_post_subject, 30, 255 ,false, '
');
$last_post_time = $user->format_date($row['forum_last_post_time']);
$last_post_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $row['forum_id_last_post'] . '&p=' . $row['forum_last_post_id']) . '#p' . $row['forum_last_post_id'];
}
@@ -470,6 +466,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'FORUM_IMAGE' => ($row['forum_image']) ? '
' : '',
'FORUM_IMAGE_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : '',
'LAST_POST_SUBJECT' => censor_text($last_post_subject),
+ 'LAST_POST_SUBJECT_TRUNCATED' => censor_text($last_post_subject_truncated),
'LAST_POST_TIME' => $last_post_time,
'LAST_POSTER' => get_username_string('username', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'LAST_POSTER_COLOUR' => get_username_string('colour', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index ca38d3b5c0..55f8e6df30 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -46,7 +46,7 @@
{UNAPPROVED_IMG}
{L_LAST_POST}
- {forumrow.LAST_POST_SUBJECT}
+ {forumrow.LAST_POST_SUBJECT_TRUNCATED}
{L_POST_BY_AUTHOR} {forumrow.LAST_POSTER_FULL}
{LAST_POST_IMG}
{forumrow.LAST_POST_TIME}{L_NO_POSTS}