diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-08-05 20:18:50 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-08-05 20:18:50 +0200 |
| commit | 801183a99bc11498840fde44d1f9a4de1d60cd67 (patch) | |
| tree | e8cea8ddbb2e987dd1505728b1f213c0f01c97cf | |
| parent | c9ada4d2019356e948c93b34a9c8530fd5a0f90d (diff) | |
| parent | 9225a0fdffdd5830e2f87ec964a90d26576b812b (diff) | |
| download | forums-801183a99bc11498840fde44d1f9a4de1d60cd67.tar forums-801183a99bc11498840fde44d1f9a4de1d60cd67.tar.gz forums-801183a99bc11498840fde44d1f9a4de1d60cd67.tar.bz2 forums-801183a99bc11498840fde44d1f9a4de1d60cd67.tar.xz forums-801183a99bc11498840fde44d1f9a4de1d60cd67.zip | |
Merge pull request #4401 from JoshyPHP/ticket/14734
[ticket/14734] Use SVG emoji
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/factory.php | 1 | ||||
| -rw-r--r-- | tests/text_formatter/s9e/default_formatting_test.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 916fdff909..f62daefdd9 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -349,6 +349,7 @@ class factory implements \phpbb\textformatter\cache_interface // Load the Emoji plugin and modify its tag's template to obey viewsmilies $configurator->Emoji->setImageSize(18); + $configurator->Emoji->useSVG(); $tag = $configurator->Emoji->getTag(); $tag->template = '<xsl:choose><xsl:when test="$S_VIEWSMILIES">' . str_replace('class="emoji"', 'class="smilies"', $tag->template) . '</xsl:when><xsl:otherwise><xsl:value-of select="."/></xsl:otherwise></xsl:choose>'; diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 5bd1123bba..a70528aba3 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -298,7 +298,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case ), array( "Emoji: \xF0\x9F\x98\x80", - 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//twemoji.maxcdn.com/36x36/1f600.png">' + 'Emoji: <img alt="' . "\xF0\x9F\x98\x80" . '" class="smilies" draggable="false" width="18" height="18" src="//twemoji.maxcdn.com/svg/1f600.svg">' ), array( "Emoji: \xF0\x9F\x98\x80", |