diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-26 21:50:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-26 21:50:49 +0200 |
| commit | b6f400a01479cf1fe847e81739cb1e74a70ecd4e (patch) | |
| tree | 8215b18919edc768b9805cc637cd77897e154669 | |
| parent | b8616fe9ace5cb21bd1d38d9998d8e4e9342b52f (diff) | |
| parent | 28fd9457e9c954dcaa956be58b6bc3d016800d2b (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 1 |
2 files changed, 0 insertions, 6 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); diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 1e1c5554e1..1667aa6011 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -56,7 +56,6 @@ $lang = array_merge($lang, array( 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', - 'BBCODE_OPEN_ENDED_TAG' => 'Your custom BBCode must contain both an opening and a closing tag.', 'BBCODE_TAG' => 'Tag', 'BBCODE_TAG_TOO_LONG' => 'The tag name you selected is too long.', 'BBCODE_TAG_DEF_TOO_LONG' => 'The tag definition that you have entered is too long, please shorten your tag definition.', |