aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-03 21:05:25 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-03 21:05:25 +0000
commit7ab232a45504ef357a19d9ab58dd27c454e12784 (patch)
tree56724a9a8bd34a4a5ad75b24f78be1b299832899 /phpBB/includes/mcp
parentb0989c3f4d67e6f9d211a526aeee44686e3bc671 (diff)
downloadforums-7ab232a45504ef357a19d9ab58dd27c454e12784.tar
forums-7ab232a45504ef357a19d9ab58dd27c454e12784.tar.gz
forums-7ab232a45504ef357a19d9ab58dd27c454e12784.tar.bz2
forums-7ab232a45504ef357a19d9ab58dd27c454e12784.tar.xz
forums-7ab232a45504ef357a19d9ab58dd27c454e12784.zip
ok, i am an idiot...
git-svn-id: file:///svn/phpbb/trunk@6548 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_queue.php14
-rwxr-xr-xphpBB/includes/mcp/mcp_reports.php8
2 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index e1721fd1f4..0f6fae18ee 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -535,9 +535,9 @@ function approve_post($post_id_list, $mode)
$messenger->im($post_data['user_jabber'], $post_data['username']);
$messenger->assign_vars(array(
- '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'])),
+ 'USERNAME' => htmlspecialchars_decode($post_data['username']),
+ 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_data['post_subject'])),
+ 'TOPIC_TITLE' => htmlspecialchars_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")
@@ -746,10 +746,10 @@ function disapprove_post($post_id_list, $mode)
$messenger->im($post_data['user_jabber'], $post_data['username']);
$messenger->assign_vars(array(
- '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'])))
+ 'USERNAME' => htmlspecialchars_decode($post_data['username']),
+ 'REASON' => htmlspecialchars_decode($disapprove_reason),
+ 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_data['post_subject'])),
+ 'TOPIC_TITLE' => htmlspecialchars_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 78ac590706..ebd1295090 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -489,10 +489,10 @@ function close_report($post_id_list, $mode, $action)
$messenger->im($reporter['user_jabber'], $reporter['username']);
$messenger->assign_vars(array(
- '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'])))
+ 'USERNAME' => htmlspecialchars_decode($reporter['username']),
+ 'CLOSER_NAME' => htmlspecialchars_decode($user->data['username']),
+ 'POST_SUBJECT' => htmlspecialchars_decode(censor_text($post_info[$post_id]['post_subject'])),
+ 'TOPIC_TITLE' => htmlspecialchars_decode(censor_text($post_info[$post_id]['topic_title'])))
);
$messenger->send($reporter['user_notify_type']);