diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-14 20:15:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-11-14 20:15:50 +0000 |
| commit | 0cdf46db0fbf2547902e42f0839cf384d509ef8e (patch) | |
| tree | f1808da88040dddb146d64c0bb57e7839db63ce2 /phpBB/install | |
| parent | 43598d7727c41a180d45f7019a7adc26d7365b9e (diff) | |
| download | forums-0cdf46db0fbf2547902e42f0839cf384d509ef8e.tar forums-0cdf46db0fbf2547902e42f0839cf384d509ef8e.tar.gz forums-0cdf46db0fbf2547902e42f0839cf384d509ef8e.tar.bz2 forums-0cdf46db0fbf2547902e42f0839cf384d509ef8e.tar.xz forums-0cdf46db0fbf2547902e42f0839cf384d509ef8e.zip | |
merge r10267
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10268 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e3511e89a4..8cac19fdbc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.6-RC4'; +$updates_to_version = '3.0.6'; // Enter any version to update from to test updates. The version within the db will not be updated. $debug_from_version = false; @@ -891,6 +891,8 @@ function database_update_info() '3.0.6-RC2' => array(), // No changes from 3.0.6-RC3 to 3.0.6-RC4 '3.0.6-RC3' => array(), + // No changes from 3.0.6-RC4 to 3.0.6 + '3.0.6-RC4' => array(), ); } @@ -1559,6 +1561,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.6-RC3 to 3.0.6-RC4 case '3.0.6-RC3': break; + + // No changes from 3.0.6-RC4 to 3.0.6 + case '3.0.6-RC3': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 30ca808ef5..1c75ee4886 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -239,7 +239,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.6-RC4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6'); 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'); |