diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 18:39:35 +0000 |
| commit | 5029170afbe7e74a0c46b3b3f1ecca83697ced42 (patch) | |
| tree | 4762e7d8d4d3b723d681f0bf5a88f65b266978b2 /phpBB/includes/acp/acp_email.php | |
| parent | 037f0bf4da281981dd5bc0e217325d2c49531409 (diff) | |
| download | forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.gz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.bz2 forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.tar.xz forums-5029170afbe7e74a0c46b3b3f1ecca83697ced42.zip | |
- fixed a few smaller things
git-svn-id: file:///svn/phpbb/trunk@5952 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 4d254bb084..e5e10223f7 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -36,8 +36,8 @@ class acp_email { // Error checking needs to go here ... if no subject and/or no message then skip // over the send and return to the form - $subject = html_entity_decode(request_var('subject', '', true)); - $message = html_entity_decode(request_var('message', '', true)); + $subject = request_var('subject', '', true); + $message = request_var('message', '', true); $use_queue = (isset($_POST['send_immediatly'])) ? false : true; $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); @@ -150,14 +150,14 @@ class acp_email $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - $messenger->subject($subject); + $messenger->subject(html_entity_decode($subject)); $messenger->replyto($config['board_email']); $messenger->set_mail_priority($priority); $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'CONTACT_EMAIL' => $config['board_contact'], - 'MESSAGE' => $message) + 'MESSAGE' => html_entity_decode($message)) ); if (!($messenger->send($used_method))) @@ -216,8 +216,8 @@ class acp_email 'S_GROUP_OPTIONS' => $select_list, 'USERNAMES' => $usernames, 'U_FIND_USERNAME' => $phpbb_root_path . "memberlist.$phpEx$SID&mode=searchuser&form=acp_email&field=usernames", - 'SUBJECT' => request_var('subject', '', true), - 'MESSAGE' => request_var('message', '', true), + 'SUBJECT' => $subject, + 'MESSAGE' => $message, 'S_PRIORITY_OPTIONS' => $s_priority_options) ); |