aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-11-19 14:37:20 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-11-19 14:37:20 +0000
commitfff6d92158c90164e8ff18acb0393f8e7c5bf111 (patch)
tree9a9f1c398276726e8affc241e472318545f74cab /phpBB/includes
parent8ce38c75048b567dd6b2c8456316fe4e68794379 (diff)
downloadforums-fff6d92158c90164e8ff18acb0393f8e7c5bf111.tar
forums-fff6d92158c90164e8ff18acb0393f8e7c5bf111.tar.gz
forums-fff6d92158c90164e8ff18acb0393f8e7c5bf111.tar.bz2
forums-fff6d92158c90164e8ff18acb0393f8e7c5bf111.tar.xz
forums-fff6d92158c90164e8ff18acb0393f8e7c5bf111.zip
#5428
git-svn-id: file:///svn/phpbb/trunk@6605 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 31bcdd2d16..f5a76f222a 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -128,8 +128,7 @@ class acp_bbcodes
$db->sql_freeresult($result);
// 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))
+ if ($info['test'] === '1' || in_array(strtolower($data['bbcode_tag']), $hard_coded) || (preg_match('#\[/([^[]*)]$#', $bbcode_match, $regs) && in_array(strtolower($regs[1]), $hard_coded)))
{
trigger_error($user->lang['BBCODE_INVALID_TAG_NAME'] . adm_back_link($this->u_action), E_USER_WARNING);
}