diff options
| author | Thomas Backlund <tmb@mageia.org> | 2017-05-26 20:02:07 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2017-05-26 20:02:07 +0300 |
| commit | 5e6803684739dc0963d784c0cefd86697ad397f3 (patch) | |
| tree | 8ab6acff6c8069c5ba3035cba3adec90dba24ba1 /phpBB/install/database_update.php | |
| parent | 8fc97191a3533a1cce0b051baa55db68d83b5dc4 (diff) | |
| parent | 11242dd07d6359a725f22f3674028adfdddb49d6 (diff) | |
| download | forums-5e6803684739dc0963d784c0cefd86697ad397f3.tar forums-5e6803684739dc0963d784c0cefd86697ad397f3.tar.gz forums-5e6803684739dc0963d784c0cefd86697ad397f3.tar.bz2 forums-5e6803684739dc0963d784c0cefd86697ad397f3.tar.xz forums-5e6803684739dc0963d784c0cefd86697ad397f3.zip | |
Merge tag 'release-3.0.14' of https://github.com/phpbb/phpbb
Merge upstream 3.0.14 release.
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 90d4010d5f..a8c3ed385f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.12'); +define('UPDATES_TO_VERSION', '3.0.14'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -949,7 +949,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.13 after the db_tools class is capable of properly + // 3.0.15 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', ''), @@ -1011,8 +1011,18 @@ function database_update_info() '3.0.12-RC2' => array(), // No changes from 3.0.12-RC3 to 3.0.12 '3.0.12-RC3' => array(), - - /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.13-RC1 */ + // No changes from 3.0.12 to 3.0.13-RC1 + '3.0.12' => array(), + // No changes from 3.0.13-RC1 to 3.0.13 + '3.0.13-RC1' => array(), + // No changes from 3.0.13 to 3.0.13-PL1 + '3.0.13' => array(), + // No changes from 3.0.13-PL1 to 3.0.14-RC1 + '3.0.13-PL1' => array(), + // No changes from 3.0.14-RC1 to 3.0.14 + '3.0.14-RC1' => array(), + + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.15-RC1 */ ); } @@ -2254,6 +2264,26 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12-RC3 to 3.0.12 case '3.0.12-RC3': break; + + // No changes from 3.0.12 to 3.0.13-RC1 + case '3.0.12': + break; + + // No changes from 3.0.13-RC1 to 3.0.13 + case '3.0.13-RC1': + break; + + // No changes from 3.0.13 to 3.0.13-PL1 + case '3.0.13': + break; + + // No changes from 3.0.13-PL1 to 3.0.14-RC1 + case '3.0.13-PL1': + break; + + // No changes from 3.0.14-RC1 to 3.0.14 + case '3.0.14-RC1': + break; } } |