aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-08-12 16:03:18 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-08-12 16:03:18 +0000
commitb850bbf882aef77cfa36cca8b8ae65682c4302bc (patch)
treea61f4b97deb081a2c3d5c24c1c496c030cb020fd
parent00fa69cab9488634716732c5cfd2ad745c33cf85 (diff)
downloadforums-b850bbf882aef77cfa36cca8b8ae65682c4302bc.tar
forums-b850bbf882aef77cfa36cca8b8ae65682c4302bc.tar.gz
forums-b850bbf882aef77cfa36cca8b8ae65682c4302bc.tar.bz2
forums-b850bbf882aef77cfa36cca8b8ae65682c4302bc.tar.xz
forums-b850bbf882aef77cfa36cca8b8ae65682c4302bc.zip
Catch too long help lines
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8743 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php6
-rw-r--r--phpBB/language/en/acp/posting.php2
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 33e8fe7ec1..b827d1107e 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -168,6 +168,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.',