diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:12:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:12:29 +0100 |
| commit | 78ce646c699d3874bb1662832528f10ce9e9d7a5 (patch) | |
| tree | cffc80b1130ae9e78eb2a2e536ba2ee5c5b3b13b /phpBB/includes/functions_display.php | |
| parent | 4ae43c79702cb6be8d2e8ddeae9f3a298ed98783 (diff) | |
| parent | 51f0c16b5f14490c286d5484756fd075f2dc207a (diff) | |
| download | forums-78ce646c699d3874bb1662832528f10ce9e9d7a5.tar forums-78ce646c699d3874bb1662832528f10ce9e9d7a5.tar.gz forums-78ce646c699d3874bb1662832528f10ce9e9d7a5.tar.bz2 forums-78ce646c699d3874bb1662832528f10ce9e9d7a5.tar.xz forums-78ce646c699d3874bb1662832528f10ce9e9d7a5.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 1ac18fd3f8..9be1ff950b 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -539,7 +539,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod { if ($row['forum_password_last_post'] === '' && $auth->acl_gets('f_read', 'f_list_topics', $row['forum_id_last_post'])) { - $last_post_subject = censor_text($row['forum_last_post_subject']); + $last_post_subject = utf8_decode_ncr(censor_text($row['forum_last_post_subject'])); + $last_post_subject_truncated = truncate_string($last_post_subject, 30, 255, false, $user->lang['ELLIPSIS']); } else |