aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-10-26 21:50:49 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-26 21:50:49 +0200
commitb6f400a01479cf1fe847e81739cb1e74a70ecd4e (patch)
tree8215b18919edc768b9805cc637cd77897e154669 /phpBB/includes/acp
parentb8616fe9ace5cb21bd1d38d9998d8e4e9342b52f (diff)
parent28fd9457e9c954dcaa956be58b6bc3d016800d2b (diff)
downloadforums-b6f400a01479cf1fe847e81739cb1e74a70ecd4e.tar
forums-b6f400a01479cf1fe847e81739cb1e74a70ecd4e.tar.gz
forums-b6f400a01479cf1fe847e81739cb1e74a70ecd4e.tar.bz2
forums-b6f400a01479cf1fe847e81739cb1e74a70ecd4e.tar.xz
forums-b6f400a01479cf1fe847e81739cb1e74a70ecd4e.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 5360ab0f7b..a67f3c54f9 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -211,11 +211,6 @@ class acp_bbcodes
$test = $data['bbcode_tag'];
}
- if (!preg_match('%\\[' . $test . '[^]]*].*?\\[/' . $test . ']%s', $bbcode_match))
- {
- trigger_error($user->lang['BBCODE_OPEN_ENDED_TAG'] . adm_back_link($this->u_action), E_USER_WARNING);
- }
-
if (strlen($data['bbcode_tag']) > 16)
{
trigger_error($user->lang['BBCODE_TAG_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING);