aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-11-01 22:12:24 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-11-01 22:12:24 +0100
commit51f0c16b5f14490c286d5484756fd075f2dc207a (patch)
tree0d53b73f38d17c7884e883d9a53177ffa98bcff0 /phpBB/includes
parente95e387188b050c163edcce3141c957d259810c9 (diff)
parentff25d0a5084e5e79bf7cc9faefd0dfdeb0ef5705 (diff)
downloadforums-51f0c16b5f14490c286d5484756fd075f2dc207a.tar
forums-51f0c16b5f14490c286d5484756fd075f2dc207a.tar.gz
forums-51f0c16b5f14490c286d5484756fd075f2dc207a.tar.bz2
forums-51f0c16b5f14490c286d5484756fd075f2dc207a.tar.xz
forums-51f0c16b5f14490c286d5484756fd075f2dc207a.zip
Merge pull request #5685 from 3D-I/ticket/16153
[ticket/16153] Enable Emojis and rich text in Topic title
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_display.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 3d45648ea1..e4adce14fc 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