2 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 5b1c89c4db..1e85856898 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>';
 
diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php
index 05ddfffa11..3698dca224 100644
--- a/phpBB/phpbb/textformatter/s9e/parser.php
+++ b/phpBB/phpbb/textformatter/s9e/parser.php
@@ -13,7 +13,7 @@
 
 namespace phpbb\textformatter\s9e;
 
-use s9e\TextFormatter\Parser\BuiltInFilters;
+use s9e\TextFormatter\Parser\AttributeFilters\UrlFilter;
 use s9e\TextFormatter\Parser\Logger;
 
 /**
@@ -196,7 +196,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	public function get_errors()
 	{
 		$errors = array();
-		foreach ($this->parser->getLogger()->get() as $entry)
+		foreach ($this->parser->getLogger()->getLogs() as $entry)
 		{
 			list(, $msg, $context) = $entry;
 
@@ -365,7 +365,7 @@ class parser implements \phpbb\textformatter\parser_interface
 	static public function filter_img_url($url, array $url_config, Logger $logger, $max_height, $max_width)
 	{
 		// Validate the URL
-		$url = BuiltInFilters::filterUrl($url, $url_config, $logger);
+		$url = UrlFilter::filter($url, $url_config, $logger);
 		if ($url === false)
 		{
 			return false;