diff options
| author | Erik Frèrejean <erikfrerejean@phpbb.com> | 2011-01-11 13:48:13 +0100 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 21:15:40 -0500 |
| commit | a7bc76d24622ce89f35023738e459ce38aa169a5 (patch) | |
| tree | 2918c3ce9316365b8ff1b70fdeb2a42368f686a3 /phpBB/includes | |
| parent | 510248da2844df22af1cd807e13b46c0c8b68290 (diff) | |
| download | forums-a7bc76d24622ce89f35023738e459ce38aa169a5.tar forums-a7bc76d24622ce89f35023738e459ce38aa169a5.tar.gz forums-a7bc76d24622ce89f35023738e459ce38aa169a5.tar.bz2 forums-a7bc76d24622ce89f35023738e459ce38aa169a5.tar.xz forums-a7bc76d24622ce89f35023738e459ce38aa169a5.zip | |
[ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.
Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes
PHPBB3-7778
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 2b706394c4..0644b38eb1 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -213,7 +213,7 @@ class acp_bbcodes $bbcode_id = NUM_CORE_BBCODES + 1; } - if ($bbcode_id > 1511) + if ($bbcode_id > BBCODE_LIMIT) { trigger_error($user->lang['TOO_MANY_BBCODES'] . adm_back_link($this->u_action), E_USER_WARNING); } diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 90440f74b8..ea34eb8e81 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -173,6 +173,9 @@ define('BBCODE_UID_LEN', 8); // Number of core BBCodes define('NUM_CORE_BBCODES', 12); +// BBCode hard limit +define('BBCODE_LIMIT', 1511); + // Smiley hard limit define('SMILEY_LIMIT', 1000); |