aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2017-10-16 22:01:18 +0200
committerJoshyPHP <s9e.dev@gmail.com>2017-11-03 13:13:46 +0100
commit9933380d800ecc807e0d05b5c77312a8d7b395d3 (patch)
tree6704264d5e2fe456c90fe544957ebd1d25a148dc /phpBB/includes/acp/acp_bbcodes.php
parentMerge pull request #5016 from Elsensee/ticket/15195 (diff)
downloadphpbb-9933380d800ecc807e0d05b5c77312a8d7b395d3.tar.gz
phpbb-9933380d800ecc807e0d05b5c77312a8d7b395d3.tar.bz2
phpbb-9933380d800ecc807e0d05b5c77312a8d7b395d3.zip
[ticket/15408] Reject duplicate BBCodes in ACP
PHPBB3-15408
Diffstat (limited to 'phpBB/includes/acp/acp_bbcodes.php')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index f958ae93c7..18d574081a 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -553,10 +553,10 @@ class acp_bbcodes
}
// Lowercase tags
- $bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+=?).*/i', '$1', $bbcode_match);
- $bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+)=?.*/i', '$1', $bbcode_match);
+ $bbcode_tag = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
+ $bbcode_search = preg_replace('/.*?\[([a-z0-9_-]+).*/i', '$1', $bbcode_match);
- if (!preg_match('/^[a-zA-Z0-9_-]+=?$/', $bbcode_tag))
+ if (!preg_match('/^[a-zA-Z0-9_-]+$/', $bbcode_tag))
{
global $user;
trigger_error($user->lang['BBCODE_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);