aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_email.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-22 20:11:45 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-22 20:11:45 +0000
commitec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6 (patch)
treec6a4f679afd375f000d5b64485c7e14737fc941b /phpBB/includes/acp/acp_email.php
parentfcb0c89962242fec72d7ed01c7049601a696e4be (diff)
downloadforums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.gz
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.bz2
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.tar.xz
forums-ec1da5b1fd694b4f1abcf4fa8009095d23b2c1a6.zip
try to normalize everything...
git-svn-id: file:///svn/phpbb/trunk@7920 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
-rw-r--r--phpBB/includes/acp/acp_email.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 3fbbe6472f..50f3d2a4c8 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -30,8 +30,8 @@ class acp_email
$usernames = request_var('usernames', '', true);
$group_id = request_var('g', 0);
- $subject = request_var('subject', '', true);
- $message = request_var('message', '', true);
+ $subject = utf8_normalize_nfc(request_var('subject', '', true));
+ $message = utf8_normalize_nfc(request_var('message', '', true));
// Do the job ...
if ($submit)
@@ -178,7 +178,7 @@ class acp_email
if ($usernames)
{
$usernames = explode("\n", $usernames);
- add_log('admin', 'LOG_MASS_EMAIL', implode(', ', $usernames));
+ add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames)));
}
else
{