aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-12 18:17:00 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-12 18:17:00 +0100
commitb7492a7b6f5215ae8d54c9ffc16455384a1d870e (patch)
tree872a6002962de6aa1bf78d39a53b7823362a39c8 /tests
parentMerge pull request #5748 from marc1706/ticket/16226 (diff)
parentMerge pull request #5772 from JoshyPHP/ticket/16252 (diff)
downloadphpbb-b7492a7b6f5215ae8d54c9ffc16455384a1d870e.tar.gz
phpbb-b7492a7b6f5215ae8d54c9ffc16455384a1d870e.tar.bz2
phpbb-b7492a7b6f5215ae8d54c9ffc16455384a1d870e.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'tests')
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-16252.after.php18
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-16252.before.php17
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-16252.html1
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-16252.txt1
4 files changed, 37 insertions, 0 deletions
diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.after.php b/tests/text_processing/tickets_data/PHPBB3-16252.after.php
new file mode 100644
index 0000000000..c2f57c171e
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16252.after.php
@@ -0,0 +1,18 @@
+<?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.
+*
+*/
+
+function after_assert_phpbb3_16252($vars)
+{
+ extract($vars);
+ $test->assertEmpty($parser->get_errors());
+}
diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.before.php b/tests/text_processing/tickets_data/PHPBB3-16252.before.php
new file mode 100644
index 0000000000..94c59d9602
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16252.before.php
@@ -0,0 +1,17 @@
+<?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.
+*
+*/
+
+function before_assert_phpbb3_16252($vars)
+{
+ $vars['parser']->disable_bbcode('url');
+}
diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.html b/tests/text_processing/tickets_data/PHPBB3-16252.html
new file mode 100644
index 0000000000..5b14ab0e7a
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16252.html
@@ -0,0 +1 @@
+http://localhost/ \ No newline at end of file
diff --git a/tests/text_processing/tickets_data/PHPBB3-16252.txt b/tests/text_processing/tickets_data/PHPBB3-16252.txt
new file mode 100644
index 0000000000..5b14ab0e7a
--- /dev/null
+++ b/tests/text_processing/tickets_data/PHPBB3-16252.txt
@@ -0,0 +1 @@
+http://localhost/ \ No newline at end of file