diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-08-13 12:28:17 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-08-13 12:28:17 +0000 |
| commit | 6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58 (patch) | |
| tree | c7ec3fc886208864b88fdcd8fb58ea6193f5a02f | |
| parent | 6a401ab68b51b71d7060d6bf54fdef67402bdfb9 (diff) | |
| download | forums-6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58.tar forums-6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58.tar.gz forums-6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58.tar.bz2 forums-6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58.tar.xz forums-6eed0e5bd2ace03c027a6c02ca3af3f0cde6cb58.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8744 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index e0d478689e..4118e5f919 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -167,6 +167,12 @@ class acp_bbcodes { trigger_error($user->lang['BBCODE_TAG_DEF_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } + + + if (strlen($bbcode_helpline) > 255) + { + trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); + } $sql_ary = array( 'bbcode_tag' => $data['bbcode_tag'], diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index ebde75cfaa..66ce911ff6 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -47,6 +47,8 @@ $lang = array_merge($lang, array( 'BBCODE_HELPLINE' => 'Help line', 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouse over text of the BBCode.', 'BBCODE_HELPLINE_TEXT' => 'Help line text', + 'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.', + 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', 'BBCODE_OPEN_ENDED_TAG' => 'Your custom BBCode must contain both an opening and a closing tag.', |