mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-26 09:44:26 +02:00
Code Issues Releases Wiki Activity

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

Browse Source 
PHPBB3-13455
This commit is contained in:
Gaëtan Muller
2015-02-02 21:35:46 +01:00
parent f6e06da4c6
commit abcb2680ee
36 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_icons.php
View File

@@ -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)
{