1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-31 05:53:14 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2019-12-12 18:21:12 +01:00
commit 94f85fee06
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 36 additions and 1 deletions

View File

@ -61,7 +61,7 @@ class link_helper
$text = substr($parser->getText(), $start, $length);
// Create a tag that consumes the link's text and make it depends on this tag
$link_text_tag = $parser->addSelfClosingTag('LINK_TEXT', $start, $length);
$link_text_tag = $parser->addSelfClosingTag('LINK_TEXT', $start, $length, 10);
$link_text_tag->setAttribute('text', $text);
$tag->cascadeInvalidationTo($link_text_tag);
}

View File

@ -0,0 +1,35 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
class phpbb_textformatter_s9e_link_helper_test extends phpbb_test_case
{
public function test_does_not_override_autoimage()
{
$container = $this->get_test_case_helpers()->set_s9e_services();
$configurator = $container->get('text_formatter.s9e.factory')->get_configurator();
$configurator->Autoimage;
extract($configurator->finalize());
$original = 'http://localhost/path_to_long_image_filename_0123456789.png';
$expected = '<r>
<URL url="http://localhost/path_to_long_image_filename_0123456789.png">
<IMG src="http://localhost/path_to_long_image_filename_0123456789.png">
<LINK_TEXT text="http://localhost/path_to_long_image_fil ... 456789.png">http://localhost/path_to_long_image_filename_0123456789.png</LINK_TEXT>
</IMG>
</URL>
</r>';
$this->assertXmlStringEqualsXmlString($expected, $parser->parse($original));
}
}