aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-11-03 20:19:52 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-11-03 20:19:52 +0000
commitb0989c3f4d67e6f9d211a526aeee44686e3bc671 (patch)
treed5422179e62da0009c645df6db05ad2f5ce08b9e /phpBB/includes/acp
parent1634814e16d052ba8738982652ba84caae1bb26d (diff)
downloadforums-b0989c3f4d67e6f9d211a526aeee44686e3bc671.tar
forums-b0989c3f4d67e6f9d211a526aeee44686e3bc671.tar.gz
forums-b0989c3f4d67e6f9d211a526aeee44686e3bc671.tar.bz2
forums-b0989c3f4d67e6f9d211a526aeee44686e3bc671.tar.xz
forums-b0989c3f4d67e6f9d211a526aeee44686e3bc671.zip
#5030
git-svn-id: file:///svn/phpbb/trunk@6547 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index e22833c8bf..445d33cacb 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -127,7 +127,9 @@ class acp_bbcodes
$info = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
- if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded))
+ // Grab the end, interrogate the last closing tag
+ preg_match('#\[/([^[]*)]$#', $bbcode_match, $regs);
+ if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded) || in_array(strtolower($regs[1]), $hard_coded))
{
trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
}