diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 22:03:42 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 22:03:42 -0500 |
| commit | ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5 (patch) | |
| tree | 5fe28547922149b323bbc0b28a0a42a60b78ce67 /phpBB/includes | |
| parent | aae3bd0c72835939acb1bf88d3d63883ad66c2f4 (diff) | |
| parent | df92b7bdf2e91f49461852eb962386009b64d2df (diff) | |
| download | forums-ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5.tar forums-ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5.tar.gz forums-ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5.tar.bz2 forums-ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5.tar.xz forums-ba41e45f84027ebcf8d5118f909cee2bf0b4ddd5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
Conflicts:
phpBB/install/database_update.php
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 b6bbbdc0cf..ecbaff6274 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 9c157cf385..216aac7489 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); |