[ticket/14000] Added support for emoji

PHPBB3-14000

phpBB/composer.lock

@@ -220,12 +220,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/s9e/TextFormatter.git",
-                "reference": "326a5a0bbaee59a3d5542fc8e38fe41971931cce"
+                "reference": "beee0e5693f7ca8ed16a94294acf53b6e6207e7c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/326a5a0bbaee59a3d5542fc8e38fe41971931cce",
-                "reference": "326a5a0bbaee59a3d5542fc8e38fe41971931cce",
+                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/beee0e5693f7ca8ed16a94294acf53b6e6207e7c",
+                "reference": "beee0e5693f7ca8ed16a94294acf53b6e6207e7c",
                 "shasum": ""
             },
             "require": {
@@ -253,6 +253,7 @@
                 "MIT"
             ],
             "description": "Multi-purpose text formatting and markup library. Plugins offer support for BBCodes, Markdown, emoticons, HTML, embedding media (YouTube, etc...), enhanced typography and more.",
+            "homepage": "https://github.com/s9e/TextFormatter/",
             "keywords": [
                 "bbcode",
                 "bbcodes",
@@ -270,7 +271,7 @@
                 "parser",
                 "shortcodes"
             ],
-            "time": "2015-07-05 23:13:46"
+            "time": "2015-07-12 16:53:32"
         },
         {
             "name": "symfony/config",

phpBB/phpbb/textformatter/s9e/factory.php

@@ -324,6 +324,11 @@ class factory implements \phpbb\textformatter\cache_interface
 		$configurator->registeredVars['max_img_height'] = 0;
 		$configurator->registeredVars['max_img_width'] = 0;
 
+		// Load the Emoji plugin and modify its tag's template to obey viewsmilies
+		$configurator->Emoji->setImageSize(18);
+		$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>';
+
 		/**
 		* Modify the s9e\TextFormatter configurator after the default settings are set
 		*