diff options
| author | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-02-02 21:35:46 +0100 |
|---|---|---|
| committer | Gaëtan Muller <m.gaetan89@gmail.com> | 2015-02-03 20:50:40 +0100 |
| commit | abcb2680eec86dc8016c489ebc7362e29be9e4df (patch) | |
| tree | ea0491929e6c625d639e4036166365aaae582fc7 /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | f6e06da4c68917dafb057bf7fe19f884a3e148c2 (diff) | |
| download | forums-abcb2680eec86dc8016c489ebc7362e29be9e4df.tar forums-abcb2680eec86dc8016c489ebc7362e29be9e4df.tar.gz forums-abcb2680eec86dc8016c489ebc7362e29be9e4df.tar.bz2 forums-abcb2680eec86dc8016c489ebc7362e29be9e4df.tar.xz forums-abcb2680eec86dc8016c489ebc7362e29be9e4df.zip | |
[ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()`
PHPBB3-13455
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 12 |
1 files changed, 6 insertions, 6 deletions
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 '; |