diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 21:05:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-03 21:05:25 +0000 |
| commit | 7ab232a45504ef357a19d9ab58dd27c454e12784 (patch) | |
| tree | 56724a9a8bd34a4a5ad75b24f78be1b299832899 /phpBB/memberlist.php | |
| parent | b0989c3f4d67e6f9d211a526aeee44686e3bc671 (diff) | |
| download | forums-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/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e73277e5a0..53c7ed81c3 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -298,16 +298,16 @@ switch ($mode) $messenger = new messenger(false); $messenger->template('profile_send_im', $row['user_lang']); - $messenger->subject(utf8_html_entity_decode($subject)); + $messenger->subject(htmlspecialchars_decode($subject)); $messenger->replyto($user->data['user_email']); $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( 'BOARD_EMAIL' => $config['board_contact'], - 'FROM_USERNAME' => utf8_html_entity_decode($user->data['username']), - 'TO_USERNAME' => utf8_html_entity_decode($row['username']), - 'MESSAGE' => utf8_html_entity_decode($message)) + 'FROM_USERNAME' => htmlspecialchars_decode($user->data['username']), + 'TO_USERNAME' => htmlspecialchars_decode($row['username']), + 'MESSAGE' => htmlspecialchars_decode($message)) ); $messenger->send(NOTIFY_IM); @@ -727,7 +727,7 @@ switch ($mode) if ($user_id) { - $messenger->subject(utf8_html_entity_decode($subject)); + $messenger->subject(htmlspecialchars_decode($subject)); $messenger->im($row['user_jabber'], $row['username']); $notify_type = $row['user_notify_type']; } @@ -743,15 +743,15 @@ switch ($mode) $messenger->assign_vars(array( 'BOARD_EMAIL' => $config['board_contact'], - 'TO_USERNAME' => utf8_html_entity_decode($row['to_name']), - 'FROM_USERNAME' => utf8_html_entity_decode($user->data['username']), - 'MESSAGE' => utf8_html_entity_decode($message)) + 'TO_USERNAME' => htmlspecialchars_decode($row['to_name']), + 'FROM_USERNAME' => htmlspecialchars_decode($user->data['username']), + 'MESSAGE' => htmlspecialchars_decode($message)) ); if ($topic_id) { $messenger->assign_vars(array( - 'TOPIC_NAME' => utf8_html_entity_decode($row['topic_title']), + 'TOPIC_NAME' => htmlspecialchars_decode($row['topic_title']), 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=" . $row['forum_id'] . "&t=$topic_id") ); } |