diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-05-02 19:41:32 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-02 19:41:32 +0200 |
| commit | ccf5575dd800ae1c3754f747a9b4d47e2542746b (patch) | |
| tree | 06ad551debabb89918dfa3e7b8585a090957c27b | |
| parent | 21b52567408341fcb69baae66c051f4d0a0e256b (diff) | |
| parent | 06a95487feac7a7fae6f9afdd81250fbf5925041 (diff) | |
| download | forums-ccf5575dd800ae1c3754f747a9b4d47e2542746b.tar forums-ccf5575dd800ae1c3754f747a9b4d47e2542746b.tar.gz forums-ccf5575dd800ae1c3754f747a9b4d47e2542746b.tar.bz2 forums-ccf5575dd800ae1c3754f747a9b4d47e2542746b.tar.xz forums-ccf5575dd800ae1c3754f747a9b4d47e2542746b.zip | |
Merge pull request #5577 from JoshyPHP/ticket/16034
[ticket/16034] Fix [url=] links being incorrectly shortened
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/link_helper.php | 6 | ||||
| -rw-r--r-- | tests/text_formatter/s9e/default_formatting_test.php | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/link_helper.php b/phpBB/phpbb/textformatter/s9e/link_helper.php index 1e113b6449..483794a83e 100644 --- a/phpBB/phpbb/textformatter/s9e/link_helper.php +++ b/phpBB/phpbb/textformatter/s9e/link_helper.php @@ -60,8 +60,10 @@ class link_helper $length = $end - $start; $text = substr($parser->getText(), $start, $length); - // Create a tag that consumes the link's text - $parser->addSelfClosingTag('LINK_TEXT', $start, $length)->setAttribute('text', $text); + // 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->setAttribute('text', $text); + $tag->cascadeInvalidationTo($link_text_tag); } /** diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 05a41c5095..a35c9138a5 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -254,6 +254,10 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case '<a href="http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" class="postlink">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</a>' ), array( + '[url=http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx[/url]', + '<a href="http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" class="postlink">http://example.org/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</a>' + ), + array( '[quote="[url=http://example.org]xxx[/url]"]...[/quote]', '<blockquote><div><cite><a href="http://example.org" class="postlink">xxx</a> wrote:</cite>...</div></blockquote>' ), |