Merge pull request #424 from annando/tearsofjoy

Unicode smilies: No tea anymore with tearsofjou
pull/425/head
Tobias Diekershoff 2017-09-16 07:26:03 +02:00 committed by GitHub
commit 91db8f35aa
1 changed files with 5 additions and 5 deletions

View File

@ -117,11 +117,6 @@ function unicode_smilies_smilies(&$a,&$b) {
// Smilies::add($b, ':fartinbed', '&#x;');
// Smilies::add($b, ':fartblush', '&#x;');
// Drinks
Smilies::add($b, ':tea', '☕');
// Smilies::add($b, ':drool', '🤤'); // Bad client support
// Sad smileys
Smilies::add($b, ':crying', '😢');
@ -243,6 +238,11 @@ function unicode_smilies_smilies(&$a,&$b) {
// Regex killers - stick these at the bottom so they appear at the end of the English and
// at the start of $OtherLanguage.
// Drinks
Smilies::add($b, ':tea', '☕');
// Smilies::add($b, ':drool', '🤤'); // Bad client support
Smilies::add($b, ':cool', '🆒');
// Smilies::add($b, ':vomit', '🤮'); // Bad client support
Smilies::add($b, ':golf', '🏌');