diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 22:02:39 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 22:02:39 -0500 |
| commit | df92b7bdf2e91f49461852eb962386009b64d2df (patch) | |
| tree | 39291f93861d15d6f818223594b05c658510a9ca /phpBB/includes | |
| parent | 510248da2844df22af1cd807e13b46c0c8b68290 (diff) | |
| parent | 5dee60e54e99913e1804d2c74f94b6e9ada390a7 (diff) | |
| download | forums-df92b7bdf2e91f49461852eb962386009b64d2df.tar forums-df92b7bdf2e91f49461852eb962386009b64d2df.tar.gz forums-df92b7bdf2e91f49461852eb962386009b64d2df.tar.bz2 forums-df92b7bdf2e91f49461852eb962386009b64d2df.tar.xz forums-df92b7bdf2e91f49461852eb962386009b64d2df.zip | |
Merge branch 'ticket/erikfrerejean/7778' into develop-olympus
* ticket/erikfrerejean/7778:
[ticket/7778] Update all the schema files
[ticket/7778] Add the column change to `mysql_upgrader.php`
[ticket/7778] BBCode single limit
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); |