aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2016-01-12 11:54:20 +0100
committerJoshyPHP <s9e.dev@gmail.com>2016-01-12 11:54:20 +0100
commite4dae8ed4b784d7a70a74a9ba74fb714c9eae750 (patch)
tree2ad4231ed0fc1ea6c42a2dd881e8a9ebc55e0422
parent68d945e93190e04b596a819742b1d88ef5495d4a (diff)
downloadforums-e4dae8ed4b784d7a70a74a9ba74fb714c9eae750.tar
forums-e4dae8ed4b784d7a70a74a9ba74fb714c9eae750.tar.gz
forums-e4dae8ed4b784d7a70a74a9ba74fb714c9eae750.tar.bz2
forums-e4dae8ed4b784d7a70a74a9ba74fb714c9eae750.tar.xz
forums-e4dae8ed4b784d7a70a74a9ba74fb714c9eae750.zip
[ticket/14405] Force a lookahead check on [URL] BBCodes
PHPBB3-14405
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php2
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-14405.html1
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-14405.txt1
3 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 63b23d2fd0..6ac55e82a8 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -94,7 +94,7 @@ class factory implements \phpbb\textformatter\cache_interface
]{TEXT2}[/QUOTE]",
'size' => '[SIZE={FONTSIZE}]{TEXT}[/SIZE]',
'u' => '[U]{TEXT}[/U]',
- 'url' => '[URL={URL;useContent}]{TEXT}[/URL]',
+ 'url' => '[URL={URL;useContent} $forceLookahead=true]{TEXT}[/URL]',
);
/**
diff --git a/tests/text_processing/tickets_data/PHPBB3-14405.html b/tests/text_processing/tickets_data/PHPBB3-14405.html
new file mode 100644
index 0000000000..5e76e032ec
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14405.html
@@ -0,0 +1 @@
+[url=<a href="http://example.org" class="postlink">http://example.org</a>]... \ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-14405.txt b/tests/text_processing/tickets_data/PHPBB3-14405.txt
new file mode 100644
index 0000000000..7005b36b23
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-14405.txt
@@ -0,0 +1 @@
+[url=http://example.org]... \ No newline at end of file