aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-01-09 20:16:06 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-01-09 20:16:06 +0000
commit289998c5e73199c8cef21748bb9750e137167947 (patch)
tree280f4c75e8ba0e59895058fe465204e96af31031 /phpBB/includes
parent11300e3cebbd3ddffbc8a76516eb7fff2fd84b0b (diff)
downloadforums-289998c5e73199c8cef21748bb9750e137167947.tar
forums-289998c5e73199c8cef21748bb9750e137167947.tar.gz
forums-289998c5e73199c8cef21748bb9750e137167947.tar.bz2
forums-289998c5e73199c8cef21748bb9750e137167947.tar.xz
forums-289998c5e73199c8cef21748bb9750e137167947.zip
#6776
git-svn-id: file:///svn/phpbb/trunk@6867 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 0853de31e0..97a2c92e1c 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -136,20 +136,19 @@ class acp_bbcodes
if (substr($data['bbcode_tag'], -1) === '=')
{
- $open = '\[' . $data['bbcode_tag'] . '.*?]';
- $close = '\[/' . substr($data['bbcode_tag'], 0, -1) . ']';
+ $test = substr($data['bbcode_tag'], 0, -1);
}
else
{
- $open = '\[' . $data['bbcode_tag'] . ']';
- $close = '\[/' . $data['bbcode_tag'] . ']';
+ $test = $data['bbcode_tag'];
}
- if (!preg_match('#' . $open . '.*?' . $close . '#s', $bbcode_match))
+ 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);
}
+ // @todo - bbcode_tag <= 16, bbcode_helpline <= 255, bbcode_match <= 4000
$sql_ary = array(
'bbcode_tag' => $data['bbcode_tag'],
'bbcode_match' => $bbcode_match,