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/develop | |
| 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/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 2 | ||||
| -rw-r--r-- | phpBB/develop/mysql_upgrader.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index c0ec876397..4ee105fa8d 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -926,7 +926,7 @@ function get_schema_struct() $schema_data['phpbb_bbcodes'] = array( 'COLUMNS' => array( - 'bbcode_id' => array('TINT:3', 0), + 'bbcode_id' => array('USINT', 0), 'bbcode_tag' => array('VCHAR:16', ''), 'bbcode_helpline' => array('VCHAR_UNI', ''), 'display_on_posting' => array('BOOL', 0), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index f61aa2e4f0..32af0bf320 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -414,7 +414,7 @@ function get_schema_struct() $schema_data['phpbb_bbcodes'] = array( 'COLUMNS' => array( - 'bbcode_id' => array('TINT:3', 0), + 'bbcode_id' => array('USINT', 0), 'bbcode_tag' => array('VCHAR:16', ''), 'bbcode_helpline' => array('VCHAR_UNI', ''), 'display_on_posting' => array('BOOL', 0), |