diff options
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index bd8df6a63b..d5d601a163 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -231,7 +231,7 @@ class acp_bbcodes 'bbcode_match' => $bbcode_match, 'bbcode_tpl' => $bbcode_tpl, 'display_on_posting' => $display_on_posting, - 'bbcode_helpline' => $bbcode_helpline, + 'bbcode_helpline' => utf8_encode_ucr($bbcode_helpline), 'first_pass_match' => $data['first_pass_match'], 'first_pass_replace' => $data['first_pass_replace'], 'second_pass_match' => $data['second_pass_match'], diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index e4adce14fc..34e2d4cc78 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1119,7 +1119,7 @@ function display_custom_bbcodes() 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_TAG' => $row['bbcode_tag'], 'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']), - 'BBCODE_HELPLINE' => $row['bbcode_helpline'], + 'BBCODE_HELPLINE' => utf8_decode_ncr($row['bbcode_helpline']), ); /** |