aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-12-26 23:41:27 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-12-26 23:51:15 +0100
commit4bf485395e2f66bc1aa8bfc9fde458c450238cb9 (patch)
tree3e0016d245fabb6547ccbef5bc4c7e8d74621b42
parentce90a215ba23ca33f210e369b0fba7a2a49b3a85 (diff)
downloadforums-4bf485395e2f66bc1aa8bfc9fde458c450238cb9.tar
forums-4bf485395e2f66bc1aa8bfc9fde458c450238cb9.tar.gz
forums-4bf485395e2f66bc1aa8bfc9fde458c450238cb9.tar.bz2
forums-4bf485395e2f66bc1aa8bfc9fde458c450238cb9.tar.xz
forums-4bf485395e2f66bc1aa8bfc9fde458c450238cb9.zip
[ticket/15921] Use twemoji
PHPBB3-15921
-rw-r--r--phpBB/docs/CREDITS.txt3
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
index fc089f9e02..90e9a31127 100644
--- a/phpBB/docs/CREDITS.txt
+++ b/phpBB/docs/CREDITS.txt
@@ -104,3 +104,6 @@ Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
MIT licenced:
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/
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index c0bbc7b0e8..d491a7180b 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -354,6 +354,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 = '<img alt="{.}" class="emoji" draggable="false" src="//twemoji.maxcdn.com/2/svg/{@tseq}.svg"/>';
$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>';
/**