6 files changed, 20 insertions, 20 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 01525fb5f5..3228ffb469 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -510,8 +510,8 @@ class ucp_groups
 						// Did we submit?
 						if ($update)
 						{
-							$group_name	= utf8_normalize_nfc($request->variable('group_name', '', true));
-							$group_desc = utf8_normalize_nfc($request->variable('group_desc', '', true));
+							$group_name	= $request->variable('group_name', '', true);
+							$group_desc = $request->variable('group_desc', '', true);
 							$group_type	= $request->variable('group_type', GROUP_FREE);
 
 							$allow_desc_bbcode	= $request->variable('desc_parse_bbcode', false);
@@ -621,7 +621,7 @@ class ucp_groups
 						}
 						else if (!$group_id)
 						{
-							$group_name = utf8_normalize_nfc($request->variable('group_name', '', true));
+							$group_name = $request->variable('group_name', '', true);
 							$group_desc_data = array(
 								'text'			=> '',
 								'allow_bbcode'	=> true,
@@ -1018,7 +1018,7 @@ class ucp_groups
 
 						$user->add_lang(array('acp/groups', 'acp/common'));
 
-						$names = utf8_normalize_nfc($request->variable('usernames', '', true));
+						$names = $request->variable('usernames', '', true);
 
 						if (!$group_id)
 						{
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 2d76be6d62..036025e84e 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -480,8 +480,8 @@ class ucp_main
 
 				if ($submit && $edit)
 				{
-					$draft_subject = utf8_normalize_nfc($request->variable('subject', '', true));
-					$draft_message = utf8_normalize_nfc($request->variable('message', '', true));
+					$draft_subject = $request->variable('subject', '', true);
+					$draft_message = $request->variable('message', '', true);
 					if (check_form_key('ucp_draft'))
 					{
 						if ($draft_message && $draft_subject)
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 5bfc0ff706..72fcb3c7a6 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -620,9 +620,9 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 	// Save Draft
 	if ($save && $auth->acl_get('u_savedrafts'))
 	{
-		$subject = utf8_normalize_nfc($request->variable('subject', '', true));
+		$subject = $request->variable('subject', '', true);
 		$subject = (!$subject && $action != 'post') ? $user->lang['NEW_MESSAGE'] : $subject;
-		$message = utf8_normalize_nfc($request->variable('message', '', true));
+		$message = $request->variable('message', '', true);
 
 		if ($subject && $message)
 		{
@@ -716,8 +716,8 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		{
 			$error[] = $user->lang['FORM_INVALID'];
 		}
-		$subject = utf8_normalize_nfc($request->variable('subject', '', true));
-		$message_parser->message = utf8_normalize_nfc($request->variable('message', '', true));
+		$subject = $request->variable('subject', '', true);
+		$message_parser->message = $request->variable('message', '', true);
 
 		$icon_id			= $request->variable('icon', 0);
 
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 3ea2973439..9c21971bf8 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -79,7 +79,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	{
 		if (check_form_key('ucp_pm_options'))
 		{
-			$folder_name = utf8_normalize_nfc($request->variable('foldername', '', true));
+			$folder_name = $request->variable('foldername', '', true);
 			$msg = '';
 
 			if ($folder_name)
@@ -135,7 +135,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	{
 		if (check_form_key('ucp_pm_options'))
 		{
-			$new_folder_name = utf8_normalize_nfc($request->variable('new_folder_name', '', true));
+			$new_folder_name = $request->variable('new_folder_name', '', true);
 			$rename_folder_id= $request->variable('rename_folder_id', 0);
 
 			if (!$new_folder_name)
@@ -295,7 +295,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			$rule_option	= $request->variable('rule_option', 0);
 			$cond_option	= $request->variable('cond_option', '');
 			$action_option	= explode('|', $request->variable('action_option', ''));
-			$rule_string	= ($cond_option != 'none') ? utf8_normalize_nfc($request->variable('rule_string', '', true)) : '';
+			$rule_string	= ($cond_option != 'none') ? $request->variable('rule_string', '', true) : '';
 			$rule_user_id	= ($cond_option != 'none') ? $request->variable('rule_user_id', 0) : 0;
 			$rule_group_id	= ($cond_option != 'none') ? $request->variable('rule_group_id', 0) : 0;
 
@@ -722,7 +722,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 	switch ($condition)
 	{
 		case 'text':
-			$rule_string = utf8_normalize_nfc($request->variable('rule_string', '', true));
+			$rule_string = $request->variable('rule_string', '', true);
 
 			$template->assign_vars(array(
 				'S_TEXT_CONDITION'	=> true,
@@ -736,7 +736,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 
 		case 'user':
 			$rule_user_id = $request->variable('rule_user_id', 0);
-			$rule_string = utf8_normalize_nfc($request->variable('rule_string', '', true));
+			$rule_string = $request->variable('rule_string', '', true);
 
 			if ($rule_string && !$rule_user_id)
 			{
@@ -779,7 +779,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 
 		case 'group':
 			$rule_group_id = $request->variable('rule_group_id', 0);
-			$rule_string = utf8_normalize_nfc($request->variable('rule_string', '', true));
+			$rule_string = $request->variable('rule_string', '', true);
 
 			$sql = 'SELECT g.group_id, g.group_name, g.group_type
 					FROM ' . GROUPS_TABLE . ' g ';
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 391aaf1781..dd225783ab 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -46,7 +46,7 @@ class ucp_profile
 			case 'reg_details':
 
 				$data = array(
-					'username'			=> utf8_normalize_nfc($request->variable('username', $user->data['username'], true)),
+					'username'			=> $request->variable('username', $user->data['username'], true),
 					'email'				=> strtolower($request->variable('email', $user->data['user_email'])),
 					'new_password'		=> $request->variable('new_password', '', true),
 					'cur_password'		=> $request->variable('cur_password', '', true),
@@ -302,7 +302,7 @@ class ucp_profile
 				$cp_data = $cp_error = array();
 
 				$data = array(
-					'jabber'		=> utf8_normalize_nfc($request->variable('jabber', $user->data['user_jabber'], true)),
+					'jabber'		=> $request->variable('jabber', $user->data['user_jabber'], true),
 				);
 
 				if ($config['allow_birthdays'])
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index ae9d7e0fba..776bf80481 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -115,7 +115,7 @@ class ucp_register
 			{
 				// We do not include the password
 				$s_hidden_fields = array_merge($s_hidden_fields, array(
-					'username'			=> utf8_normalize_nfc($request->variable('username', '', true)),
+					'username'			=> $request->variable('username', '', true),
 					'email'				=> strtolower($request->variable('email', '')),
 					'lang'				=> $user->lang_name,
 					'tz'				=> $request->variable('tz', $config['board_timezone']),
@@ -192,7 +192,7 @@ class ucp_register
 		$timezone = $config['board_timezone'];
 
 		$data = array(
-			'username'			=> utf8_normalize_nfc($request->variable('username', '', true)),
+			'username'			=> $request->variable('username', '', true),
 			'new_password'		=> $request->variable('new_password', '', true),
 			'password_confirm'	=> $request->variable('password_confirm', '', true),
 			'email'				=> strtolower($request->variable('email', '')),