diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-11-12 14:29:32 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-11-12 14:29:32 +0000 |
| commit | cf34efb06ce62407232d63dd4e73b8afc6e2a4ef (patch) | |
| tree | 59501fb88bc314e1fd63c122990d35eb9dc96a7f /phpBB/includes/ucp/ucp_pm_options.php | |
| parent | fa9d7e4ab47cf3655617a815adcfa369ae0e8706 (diff) | |
| download | forums-cf34efb06ce62407232d63dd4e73b8afc6e2a4ef.tar forums-cf34efb06ce62407232d63dd4e73b8afc6e2a4ef.tar.gz forums-cf34efb06ce62407232d63dd4e73b8afc6e2a4ef.tar.bz2 forums-cf34efb06ce62407232d63dd4e73b8afc6e2a4ef.tar.xz forums-cf34efb06ce62407232d63dd4e73b8afc6e2a4ef.zip | |
message
git-svn-id: file:///svn/phpbb/trunk@6569 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_options.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_options.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 256e781f1f..9b86553569 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -250,6 +250,8 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit $rule_string = ($cond_option != 'none') ? request_var('rule_string', '', true) : ''; $rule_user_id = ($cond_option != 'none') ? request_var('rule_user_id', 0) : 0; $rule_group_id = ($cond_option != 'none') ? request_var('rule_group_id', 0) : 0; + + utf8_normalize_nfc(&$rule_string); $action = (int) $action_option[0]; $folder_id = (int) $action_option[1]; @@ -639,6 +641,8 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule { case 'text': $rule_string = request_var('rule_string', '', true); + + utf8_normalize_nfc(&$rule_string); $template->assign_vars(array( 'S_TEXT_CONDITION' => true, @@ -653,6 +657,8 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule case 'user': $rule_user_id = request_var('rule_user_id', 0); $rule_string = request_var('rule_string', '', true); + + utf8_normalize_nfc(&$rule_string); if ($rule_string && !$rule_user_id) { @@ -696,6 +702,8 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule case 'group': $rule_group_id = request_var('rule_group_id', 0); $rule_string = request_var('rule_string', '', true); + + utf8_normalize_nfc(&$rule_string); $sql_and = ($auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? '<> ' . GROUP_SPECIAL : 'NOT IN (' . GROUP_SPECIAL . ', ' . GROUP_HIDDEN . ')'; $sql = 'SELECT group_id, group_name, group_type |