diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-12-12 18:20:56 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-12-12 18:20:56 +0100 |
| commit | d9749d5bb03fe76ae1c9fb46a2fbe6942c357664 (patch) | |
| tree | f4f76f6e03da6c5d2c0cece67e94f4641187a079 | |
| parent | b7492a7b6f5215ae8d54c9ffc16455384a1d870e (diff) | |
| parent | 4b376de3bf87ff5f88060f5466562cf33467a731 (diff) | |
| download | forums-d9749d5bb03fe76ae1c9fb46a2fbe6942c357664.tar forums-d9749d5bb03fe76ae1c9fb46a2fbe6942c357664.tar.gz forums-d9749d5bb03fe76ae1c9fb46a2fbe6942c357664.tar.bz2 forums-d9749d5bb03fe76ae1c9fb46a2fbe6942c357664.tar.xz forums-d9749d5bb03fe76ae1c9fb46a2fbe6942c357664.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/link_helper.php | 2 | ||||
| -rw-r--r-- | tests/text_formatter/s9e/link_helper_test.php | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/link_helper.php b/phpBB/phpbb/textformatter/s9e/link_helper.php index 483794a83e..1cd5dd2fa7 100644 --- a/phpBB/phpbb/textformatter/s9e/link_helper.php +++ b/phpBB/phpbb/textformatter/s9e/link_helper.php @@ -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); } diff --git a/tests/text_formatter/s9e/link_helper_test.php b/tests/text_formatter/s9e/link_helper_test.php new file mode 100644 index 0000000000..762d67f883 --- /dev/null +++ b/tests/text_formatter/s9e/link_helper_test.php @@ -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)); + } +} |