sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 4.3.6

Browse Source
This commit is contained in:
Neo committed 2025-12-19 05:49:12 -08:00
1 parent fe1acf984a
commit 1a0c7fd3c2
609 files changed
+14707 -5726
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/modules/admin/editor/emoticons.php
+3 -20
View File
@@ -49,7 +49,7 @@ class _emoticons extends \IPS\Dispatcher\Controller
if ( $activeTab == 'standard' )
{
if ( \IPS\Settings::i()->getFromConfGlobal('sql_utf8mb4') )
if ( \IPS\Settings::i()->getFromConfGlobal('sql_utf8mb4') === TRUE )
{
$form = new \IPS\Helpers\Form;
$form->add( new \IPS\Helpers\Form\Radio( 'emoji_style', \IPS\Settings::i()->emoji_style, FALSE, array(
@@ -59,11 +59,6 @@ class _emoticons extends \IPS\Dispatcher\Controller
'emojione' => 'emoji_style_emojione',
'disabled' => 'emoji_style_disabled',
),
'toggles' => array(
'native' => array( 'emoji_shortcodes', 'emoji_ascii' ),
'twemoji' => array( 'emoji_shortcodes', 'emoji_ascii' ),
'emojione' => array( 'emoji_shortcodes', 'emoji_ascii' ),
),
) ) );
\IPS\Member::loggedIn()->language()->get( 'emoji_style_native' ); // We need to preload the word before we can add more text to it.
\IPS\Member::loggedIn()->language()->words['emoji_style_native'] .= "<br><div class='ipsType_large ipsSpacer_top ipsSpacer_half'><span class='ipsEmoji'>😀</span><span class='ipsEmoji'>😉</span><span class='ipsEmoji'>😂</span><span class='ipsEmoji'>😍</span><span class='ipsEmoji'>🤘</span><span class='ipsEmoji'>🤦‍♀️</span><span class='ipsEmoji'>🤷‍♂️</span><span class='ipsEmoji'>🍿</span><span class='ipsEmoji'>🚀</span><span class='ipsEmoji'>🎉</span><span class='ipsEmoji'>🏳️‍🌈</span></div>"; // Have to do this here because if we try to put it in the actual language string, that will cause an error if not utf8mb4
@@ -318,22 +313,10 @@ class _emoticons extends \IPS\Dispatcher\Controller
continue;
}
if ( !isset( $data['order'] ) )
{
if ( !isset( $orders[ $data['set'] ] ) )
{
$orders[ $data['set'] ] = 0;
}
$data['order'] = ++$orders[ $data['set'] ];
}
if ( $emoticons[ $id ]['typed'] !== $data['name'] or $data['order'] != $emoticons[ $id ]['emo_position'] )
if ( $emoticons[ $id ]['typed'] !== $data['name'] )
{
$save = array( 'typed' => preg_replace( "#\s#", "", $data['name'] ) );
if ( isset( $data['order'] ) )
{
$save['emo_position'] = $data['order'];
}
if ( $set !== NULL )
{
$save['emo_set'] = str_replace( 'core_emoticon_group_', '', $data['set'] );