aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/textformatter/s9e/factory.php
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2017-12-10 02:54:38 +0100
committerJoshyPHP <s9e.dev@gmail.com>2017-12-10 02:55:10 +0100
commitb9dce3fa65a508baa02bc66e86e68b931e0ba670 (patch)
tree12b8ca95766b529ef4049f4b48f2667712818e3f /phpBB/phpbb/textformatter/s9e/factory.php
parent2643e851f2acfe703364d96fb00ab52c38369a5b (diff)
downloadforums-b9dce3fa65a508baa02bc66e86e68b931e0ba670.tar
forums-b9dce3fa65a508baa02bc66e86e68b931e0ba670.tar.gz
forums-b9dce3fa65a508baa02bc66e86e68b931e0ba670.tar.bz2
forums-b9dce3fa65a508baa02bc66e86e68b931e0ba670.tar.xz
forums-b9dce3fa65a508baa02bc66e86e68b931e0ba670.zip
[ticket/15457] Updated s9e/text-formatter dependency
PHPBB3-15457
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e/factory.php')
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 15d0a5e3e5..1548b17945 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -266,7 +266,8 @@ class factory implements \phpbb\textformatter\cache_interface
->addParameterByName('logger')
->addParameterByName('max_img_height')
->addParameterByName('max_img_width')
- ->markAsSafeAsURL();
+ ->markAsSafeAsURL()
+ ->setJS('UrlFilter.filter');
// Add default BBCodes
foreach ($this->get_default_bbcodes($configurator) as $bbcode)
@@ -355,8 +356,6 @@ class factory implements \phpbb\textformatter\cache_interface
$configurator->registeredVars['max_img_width'] = 0;
// Load the Emoji plugin and modify its tag's template to obey viewsmilies
- $configurator->Emoji->omitImageSize();
- $configurator->Emoji->useSVG();
$tag = $configurator->Emoji->getTag();
$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>';