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/acp/acp_icons.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/acp/acp_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 6105bdcc92..fdf366097a 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -334,16 +334,16 @@ class acp_icons $image_width = (isset($_POST['width'])) ? $request->variable('width', array('' => 0)) : array(); $image_height = (isset($_POST['height'])) ? $request->variable('height', array('' => 0)) : array(); $image_add = (isset($_POST['add_img'])) ? $request->variable('add_img', array('' => 0)) : array(); - $image_emotion = utf8_normalize_nfc($request->variable('emotion', array('' => ''), true)); - $image_code = utf8_normalize_nfc($request->variable('code', array('' => ''), true)); + $image_emotion = $request->variable('emotion', array('' => ''), true); + $image_code = $request->variable('code', array('' => ''), true); $image_display_on_posting = (isset($_POST['display_on_posting'])) ? $request->variable('display_on_posting', array('' => 0)) : array(); // Ok, add the relevant bits if we are adding new codes to existing emoticons... if ($request->variable('add_additional_code', false, false, \phpbb\request\request_interface::POST)) { $add_image = $request->variable('add_image', ''); - $add_code = utf8_normalize_nfc($request->variable('add_code', '', true)); - $add_emotion = utf8_normalize_nfc($request->variable('add_emotion', '', true)); + $add_code = $request->variable('add_code', '', true); + $add_emotion = $request->variable('add_emotion', '', true); if ($add_image && $add_emotion && $add_code) { |