diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-11-19 14:56:06 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-11-19 14:56:06 +0000 |
| commit | 444113e7f4b432569efc8fe3dc2d3d6a86afa1f1 (patch) | |
| tree | 3da3bd30ddee6c5f2b01a5f22eb7cba24d6f7a14 | |
| parent | f31e170e9940505aa6db0fc5d2c5ae7d074c2793 (diff) | |
| download | forums-444113e7f4b432569efc8fe3dc2d3d6a86afa1f1.tar forums-444113e7f4b432569efc8fe3dc2d3d6a86afa1f1.tar.gz forums-444113e7f4b432569efc8fe3dc2d3d6a86afa1f1.tar.bz2 forums-444113e7f4b432569efc8fe3dc2d3d6a86afa1f1.tar.xz forums-444113e7f4b432569efc8fe3dc2d3d6a86afa1f1.zip | |
#5452
git-svn-id: file:///svn/phpbb/trunk@6608 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index e21e2fb37f..dd1897ecbd 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -134,6 +134,11 @@ class acp_bbcodes } } + if (!preg_match('#\[' . $data['bbcode_tag'] .'].*?\[/' . $data['bbcode_tag'] . ']#s', $bbcode_match)) + { + trigger_error($user->lang['BBCODE_OPEN_ENDED_TAG'] . adm_back_link($this->u_action), E_USER_WARNING); + } + $sql_ary = array( 'bbcode_tag' => $data['bbcode_tag'], 'bbcode_match' => $bbcode_match, diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 5e396fc83c..13dae541ac 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -38,11 +38,12 @@ $lang = array_merge($lang, array( 'BBCODE_ADDED' => 'BBCode added successfully.', 'BBCODE_EDITED' => 'BBCode edited successfully.', - 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist.', 'BBCODE_HELPLINE' => 'Helpline', 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouseover text of the BBCode', 'BBCODE_HELPLINE_TEXT' => 'Helpline text', + 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', + '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 definition that you have entered is too long, please shorten your tag definition.', 'BBCODE_USAGE' => 'BBCode usage', |