3 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 8dbf70ccb1..84cc8ddd1c 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -347,6 +347,10 @@ class acp_board
 
 		$this->new_config = $config;
 		$cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => ''), true) : $this->new_config;
+		if (isset($_REQUEST['config']))
+		{
+			utf8_normalize_nfc(&$cfg_array);
+		}
 		$error = array();
 
 		// We validate the complete config if whished
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 0cba781542..30c4e27b63 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -985,11 +985,13 @@ class acp_users
 					'website'		=> request_var('website', $user_row['user_website']),
 					'location'		=> request_var('location', $user_row['user_from'], true),
 					'occupation'	=> request_var('occupation', $user_row['user_occ'], true),
-					'interests'		=> request_var('interests', $user_row['user_interests']),
+					'interests'		=> request_var('interests', $user_row['user_interests'], true),
 					'bday_day'		=> 0,
 					'bday_month'	=> 0,
 					'bday_year'		=> 0,
 				);
+				
+				utf8_normalize_nfc(array(&$data['location'], &$data['occupation'], &$data['interests']));
 
 				if ($user_row['user_birthday'])
 				{
@@ -1551,6 +1553,8 @@ class acp_users
 				$enable_urls	= request_var('enable_urls', true);
 				$signature		= request_var('signature', $user_row['user_sig'], true);
 				
+				utf8_normalize_nfc(&$signature);
+				
 				$preview		= (isset($_POST['preview'])) ? true : false;
 
 				if ($submit || $preview)
diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php
index dc5a694d0a..8fe99b8c80 100644
--- a/phpBB/includes/acp/acp_words.php
+++ b/phpBB/includes/acp/acp_words.php
@@ -71,6 +71,8 @@ class acp_words
 				$word_id = request_var('id', 0);
 				$word = request_var('word', '', true);
 				$replacement = request_var('replacement', '', true);
+				
+				utf8_normalize_nfc(array(&$word, &$replacement));
 
 				if (!$word || !$replacement)
 				{