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/install/database_update.php | |
| 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/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e1cbd724e1..6d744502e1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -920,8 +920,16 @@ function database_update_info() '3.0.7-PL1' => array(), // No changes from 3.0.8-RC1 to 3.0.8 '3.0.8-RC1' => array(), - // No changes from 3.0.8 to 3.0.9-RC1 - '3.0.8' => array(), + + // Changes from 3.0.8 to 3.0.9-RC1 + '3.0.8' => array( + 'change_columns' => array( + BBCODES_TABLE => array( + 'bbcode_id' => array('USINT', 0), + ), + ), + ), + // No changes from 3.1.0-dev to 3.1.0-A1 '3.1.0-dev' => array(), ); |