aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-05-25 13:01:32 -0500
committerAndreas Fischer <bantu@phpbb.com>2010-06-15 13:39:58 +0200
commitd6551b123367a0b5ae86ae53819280b0b32d8440 (patch)
tree572f0c58a90818b6c038872b2242433e12458a9a /phpBB
parentMerge branch 'feature/notify_status' into develop-olympus (diff)
downloadphpbb-d6551b123367a0b5ae86ae53819280b0b32d8440.tar.gz
phpbb-d6551b123367a0b5ae86ae53819280b0b32d8440.tar.bz2
phpbb-d6551b123367a0b5ae86ae53819280b0b32d8440.zip
[ticket/9623] Proper UTF8 encoding for usernames in pruning section
The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_prune.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index 7eeb37133f..ffe20f86f5 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -315,8 +315,8 @@ class acp_prune
'mode' => $mode,
'prune' => 1,
- 'users' => request_var('users', '', true),
- 'username' => request_var('username', '', true),
+ 'users' => utf8_normalize_nfc(request_var('users', '', true)),
+ 'username' => utf8_normalize_nfc(request_var('username', '', true)),
'email' => request_var('email', ''),
'joined_select' => request_var('joined_select', ''),
'joined' => request_var('joined', ''),
@@ -369,7 +369,7 @@ class acp_prune
{
global $user, $db;
- $users = request_var('users', '', true);
+ $users = utf8_normalize_nfc(request_var('users', '', true));
if ($users)
{
@@ -378,7 +378,7 @@ class acp_prune
}
else
{
- $username = request_var('username', '', true);
+ $username = utf8_normalize_nfc(request_var('username', '', true));
$email = request_var('email', '');
$joined_select = request_var('joined_select', 'lt');