diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-21 01:08:43 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-21 01:08:43 +0100 |
| commit | c67ca0ac9903ee2ab018da49141d8d085073f41a (patch) | |
| tree | 462b5b51fa2265d262f3ef1f0a59e3faf58a2a02 /phpBB/install | |
| parent | d766ee3fe65924aa8379ef0672b2f52315415612 (diff) | |
| parent | a9d7b1f9a144a6354638e6ef30e42cec2463f1b8 (diff) | |
| download | forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.gz forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.bz2 forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.tar.xz forums-c67ca0ac9903ee2ab018da49141d8d085073f41a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.10-RC1
[develop-olympus] Bump version numbers for 3.0.10-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
Conflicts:
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 255ea36aad..d33dbc5610 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1022,7 +1022,7 @@ function database_update_info() // this column was removed from the database updater // after 3.0.9-RC3 was released. It might still exist // in 3.0.9-RCX installations and has to be dropped in - // 3.0.10 after the db_tools class is capable of properly + // 3.0.11 after the db_tools class is capable of properly // removing a primary key. // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), @@ -1056,8 +1056,10 @@ function database_update_info() '3.0.9-RC3' => array(), // No changes from 3.0.9-RC4 to 3.0.9 '3.0.9-RC4' => array(), + // No changes from 3.0.9 to 3.0.10-RC1 + '3.0.9' => array(), - /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.10-RC1 */ + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ // Changes from 3.1.0-dev to 3.1.0-A1 '3.1.0-dev' => array( |