mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-13 03:44:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into next-back

Browse Source
This commit is contained in:
Toby Zerner
2017-12-26 19:50:48 +10:30
parent f4e7a80033 41616e45ca
commit 92017e5a40
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/emoji/src/Listener/FormatEmoticons.php
View File

@@ -31,6 +31,7 @@ class FormatEmoticons
{
$event->configurator->Emoji->useEmojiOne();
$event->configurator->Emoji->omitImageSize();
$event->configurator->Emoji->useSVG();
$event->configurator->Emoji->addAlias(':)', '🙂');
$event->configurator->Emoji->addAlias(':D', '😃');
@@ -40,7 +41,6 @@ class FormatEmoticons
$event->configurator->Emoji->addAlias(';)', '😉');
$event->configurator->Emoji->addAlias(':\'(', '😢');
$event->configurator->Emoji->addAlias(':O', '😮');
$event->configurator->Emoji->addAlias('B)', '😎');
$event->configurator->Emoji->addAlias('>:(', '😡');
}
}