diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:39 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:39 +0100 |
| commit | 1f3498c0d6a20a08fe17948b32fc435f85a6eff8 (patch) | |
| tree | e665177edec38473d116620bba9959a448795f49 /phpBB/install | |
| parent | a0b58772175ce7490872356c5050d08bd15b488b (diff) | |
| parent | d78df35da9c41883ae988008952a9d360c591883 (diff) | |
| download | forums-1f3498c0d6a20a08fe17948b32fc435f85a6eff8.tar forums-1f3498c0d6a20a08fe17948b32fc435f85a6eff8.tar.gz forums-1f3498c0d6a20a08fe17948b32fc435f85a6eff8.tar.bz2 forums-1f3498c0d6a20a08fe17948b32fc435f85a6eff8.tar.xz forums-1f3498c0d6a20a08fe17948b32fc435f85a6eff8.zip | |
Merge commit 'release-3.0.4'
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 9 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a0627a917f..fb37b62203 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.4-RC1'; +$updates_to_version = '3.0.4'; // Return if we "just include it" to find out for which version the database update is responsible for if (defined('IN_PHPBB') && defined('IN_INSTALL')) @@ -587,6 +587,9 @@ $database_update_info = array( ), ), ), + + // Changes from 3.0.4-RC1 to 3.0.4 + '3.0.4-RC1' => array(), ); // Determine mapping database type @@ -2028,6 +2031,10 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + + // Changes from 3.0.4-RC1 to 3.0.4 + case '3.0.4-RC1': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index f469436e00..1e2669aeb5 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -218,7 +218,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); |