Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-12-30 22:55:02 +01:00
commit c3263d0e10
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -559,7 +559,37 @@ class acp_board
continue; continue;
} }
// Array of emoji-enabled configurations
$config_name_ary = [
'sitename',
'site_desc',
'site_home_text',
'board_index_text',
'board_disable_msg',
];
/**
* Event to manage the array of emoji-enabled configurations
*
* @event core.acp_board_config_emoji_enabled
* @var array config_name_ary Array of config names to process
* @since 3.3.3-RC1
*/
$vars = ['config_name_ary'];
extract($phpbb_dispatcher->trigger_event('core.acp_board_config_emoji_enabled', compact($vars)));
if (in_array($config_name, $config_name_ary))
{
/**
* Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR.
* Using their Numeric Character Reference's Hexadecimal notation.
*/
$config->set($config_name, utf8_encode_ucr($config_value));
}
else
{
$config->set($config_name, $config_value); $config->set($config_name, $config_value);
}
if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable'])) if ($config_name == 'allow_quick_reply' && isset($_POST['allow_quick_reply_enable']))
{ {