diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-12-27 18:11:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-12-27 18:11:18 +0100 |
| commit | 9632294730af3322c467dd5793a6b3d74fe9cd57 (patch) | |
| tree | 3844060f73c9dda5dfc4b603a9e7a311a7de0bad /phpBB/phpbb/textformatter/s9e | |
| parent | 6acfe2a0cb584de823bc0633e6a864180effebf8 (diff) | |
| parent | b9dce3fa65a508baa02bc66e86e68b931e0ba670 (diff) | |
| download | forums-9632294730af3322c467dd5793a6b3d74fe9cd57.tar forums-9632294730af3322c467dd5793a6b3d74fe9cd57.tar.gz forums-9632294730af3322c467dd5793a6b3d74fe9cd57.tar.bz2 forums-9632294730af3322c467dd5793a6b3d74fe9cd57.tar.xz forums-9632294730af3322c467dd5793a6b3d74fe9cd57.zip | |
Merge pull request #5046 from JoshyPHP/ticket/15457
[ticket/15457] Updated s9e/text-formatter dependency
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/factory.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/parser.php | 6 |
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; |