From e9310c928e8531a560d3034dba2db1a0d2f9a395 Mon Sep 17 00:00:00 2001
From: JoshyPHP <JoshyPHP@users.noreply.github.com>
Date: Sat, 29 Dec 2018 11:12:04 +0100
Subject: [ticket/15921] Use backward compatible template for emojis

PHPBB3-15921
---
 phpBB/phpbb/textformatter/s9e/factory.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/textformatter/s9e/factory.php')

diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index d491a7180b..6191b9a315 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -354,7 +354,14 @@ 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="@tseq">
+				<img alt="{.}" class="emoji" draggable="false" src="//twemoji.maxcdn.com/2/svg/{@tseq}.svg"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<img alt="{.}" class="emoji" draggable="false" src="https://cdn.jsdelivr.net/gh/s9e/emoji-assets-twemoji@11.2/dist/svgz/{@seq}.svgz"/>
+			</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>';
 
 		/**
-- 
cgit v1.2.1