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/posting.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/posting.php')
| -rw-r--r-- | phpBB/posting.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index a82bd37641..ecd9e9f6c0 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -676,9 +676,9 @@ $quote_status = true; // Save Draft if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ($mode == 'reply' || $mode == 'post' || $mode == 'quote')) { - $subject = utf8_normalize_nfc($request->variable('subject', '', true)); + $subject = $request->variable('subject', '', true); $subject = (!$subject && $mode != 'post') ? $post_data['topic_title'] : $subject; - $message = utf8_normalize_nfc($request->variable('message', '', true)); + $message = $request->variable('message', '', true); if ($subject && $message) { @@ -810,11 +810,11 @@ if ($load && ($mode == 'reply' || $mode == 'quote' || $mode == 'post') && $post_ if ($submit || $preview || $refresh) { $post_data['topic_cur_post_id'] = $request->variable('topic_cur_post_id', 0); - $post_data['post_subject'] = utf8_normalize_nfc($request->variable('subject', '', true)); - $message_parser->message = utf8_normalize_nfc($request->variable('message', '', true)); + $post_data['post_subject'] = $request->variable('subject', '', true); + $message_parser->message = $request->variable('message', '', true); - $post_data['username'] = utf8_normalize_nfc($request->variable('username', $post_data['username'], true)); - $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, \phpbb\request\request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? utf8_normalize_nfc($request->variable('edit_reason', '', true)) : ''; + $post_data['username'] = $request->variable('username', $post_data['username'], true); + $post_data['post_edit_reason'] = ($request->variable('edit_reason', false, false, \phpbb\request\request_interface::POST) && $mode == 'edit' && $auth->acl_get('m_edit', $forum_id)) ? $request->variable('edit_reason', '', true) : ''; $post_data['orig_topic_type'] = $post_data['topic_type']; $post_data['topic_type'] = $request->variable('topic_type', (($mode != 'post') ? (int) $post_data['topic_type'] : POST_NORMAL)); @@ -887,9 +887,9 @@ if ($submit || $preview || $refresh) } else { - $post_data['poll_title'] = utf8_normalize_nfc($request->variable('poll_title', '', true)); + $post_data['poll_title'] = $request->variable('poll_title', '', true); $post_data['poll_length'] = $request->variable('poll_length', 0); - $post_data['poll_option_text'] = utf8_normalize_nfc($request->variable('poll_option_text', '', true)); + $post_data['poll_option_text'] = $request->variable('poll_option_text', '', true); $post_data['poll_max_options'] = $request->variable('poll_max_options', 1); $post_data['poll_vote_change'] = ($auth->acl_get('f_votechg', $forum_id) && $auth->acl_get('f_vote', $forum_id) && isset($_POST['poll_vote_change'])) ? 1 : 0; } @@ -1074,9 +1074,9 @@ if ($submit || $preview || $refresh) if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply'))) { $captcha_data = array( - 'message' => utf8_normalize_nfc($request->variable('message', '', true)), - 'subject' => utf8_normalize_nfc($request->variable('subject', '', true)), - 'username' => utf8_normalize_nfc($request->variable('username', '', true)), + 'message' => $request->variable('message', '', true), + 'subject' => $request->variable('subject', '', true), + 'username' => $request->variable('username', '', true), ); $vc_response = $captcha->validate($captcha_data); if ($vc_response) |