diff options
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 22 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 7e23cf3219..e43a861cb9 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -537,11 +537,11 @@ function approve_post($post_id_list, $mode) $messenger->im($post_data['user_jabber'], $post_data['username']); $messenger->assign_vars(array( - 'EMAIL_SIG' => $email_sig, - 'SITENAME' => $config['sitename'], - 'USERNAME' => html_entity_decode($post_data['username']), - 'POST_SUBJECT' => html_entity_decode(censor_text($post_data['post_subject'])), - 'TOPIC_TITLE' => html_entity_decode(censor_text($post_data['topic_title'])), + 'EMAIL_SIG' => utf8_html_entity_decode($email_sig), + 'SITENAME' => utf8_html_entity_decode($config['sitename']), + 'USERNAME' => utf8_html_entity_decode($post_data['username']), + 'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_data['post_subject'])), + 'TOPIC_TITLE' => utf8_html_entity_decode(censor_text($post_data['topic_title'])), 'U_VIEW_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t={$post_data['topic_id']}&e=0", 'U_VIEW_POST' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t={$post_data['topic_id']}&p=$post_id&e=$post_id") @@ -752,12 +752,12 @@ function disapprove_post($post_id_list, $mode) $messenger->im($post_data['user_jabber'], $post_data['username']); $messenger->assign_vars(array( - 'EMAIL_SIG' => $email_sig, - 'SITENAME' => $config['sitename'], - 'USERNAME' => html_entity_decode($post_data['username']), - 'REASON' => html_entity_decode($disapprove_reason), - 'POST_SUBJECT' => html_entity_decode(censor_text($post_data['post_subject'])), - 'TOPIC_TITLE' => html_entity_decode(censor_text($post_data['topic_title']))) + 'EMAIL_SIG' => utf8_html_entity_decode($email_sig), + 'SITENAME' => utf8_html_entity_decode($config['sitename']), + 'USERNAME' => utf8_html_entity_decode($post_data['username']), + 'REASON' => utf8_html_entity_decode($disapprove_reason), + 'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_data['post_subject'])), + 'TOPIC_TITLE' => utf8_html_entity_decode(censor_text($post_data['topic_title']))) ); $messenger->send($post_data['user_notify_type']); diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 4ede1ab416..f9103dcd40 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -491,12 +491,12 @@ function close_report($post_id_list, $mode, $action) $messenger->im($reporter['user_jabber'], $reporter['username']); $messenger->assign_vars(array( - 'EMAIL_SIG' => $email_sig, - 'SITENAME' => $config['sitename'], - 'USERNAME' => html_entity_decode($reporter['username']), - 'CLOSER_NAME' => html_entity_decode($user->data['username']), - 'POST_SUBJECT' => html_entity_decode(censor_text($post_info[$post_id]['post_subject'])), - 'TOPIC_TITLE' => html_entity_decode(censor_text($post_info[$post_id]['topic_title']))) + 'EMAIL_SIG' => utf8_html_entity_decode($email_sig), + 'SITENAME' => utf8_html_entity_decode($config['sitename']), + 'USERNAME' => utf8_html_entity_decode($reporter['username']), + 'CLOSER_NAME' => utf8_html_entity_decode($user->data['username']), + 'POST_SUBJECT' => utf8_html_entity_decode(censor_text($post_info[$post_id]['post_subject'])), + 'TOPIC_TITLE' => utf8_html_entity_decode(censor_text($post_info[$post_id]['topic_title']))) ); $messenger->send($reporter['user_notify_type']); |