makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17304] Stop using twemoji and rely on system emojis

Browse source 
PHPBB-17304
This commit is contained in:
Marc Alexander 2024-10-23 21:29:35 +02:00
parent b49fcc2a18
commit 25fca31646
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/docs/CREDITS.txt
View file

@ -106,7 +106,4 @@ MIT licensed:
Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/
Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com
Emoji by:
Twemoji (c) 2018 Twitter, Inc, https://twemoji.twitter.com/
HiDPI smilies by rednoah: https://github.com/rednoah/phpBB-smilies

10
phpBB/phpbb/textformatter/s9e/factory.php
View file

@ -358,15 +358,7 @@ class factory implements \phpbb\textformatter\cache_interface
// Load the Emoji plugin and modify its tag's template to obey viewsmilies
$tag = $configurator->Emoji->getTag();
$tag->template = '<xsl:choose>
<xsl:when test="@tseq">
<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@tseq}.svg"/>
</xsl:when>
<xsl:otherwise>
<img alt="{.}" class="emoji" draggable="false" src="//cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{@seq}.svg"/>
</xsl:otherwise>
</xsl:choose>';
$tag->template = '<xsl:choose><xsl:when test="$S_VIEWSMILIES">' . str_replace('class="emoji"', 'class="emoji smilies"', $tag->template) . '</xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>';
$tag->template = '<span class="emoji"><xsl:value-of select="."/></span>';
/**
* Modify the s9e\TextFormatter configurator after the default settings are set

7
phpBB/styles/prosilver/theme/common.css
View file

@ -1224,14 +1224,9 @@ ul.linklist:after,
content: "";
}
/* stylelint-disable declaration-property-unit-allowed-list */
.emoji {
width: 1em;
min-width: 18px;
height: 1em;
min-height: 18px;
font-size: 17px;
}
/* stylelint-enable declaration-property-unit-allowed-list */
.smilies {
vertical-align: text-bottom;