diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-18 14:05:56 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-18 14:05:56 +0100 |
| commit | 635752fafc275c091cfc130e2f7b5e2ca5fe91d5 (patch) | |
| tree | f7b33c10e2db306c0cab7cd05b73a00675f41b4e /phpBB/install | |
| parent | 2e51e68ca145940462155d5164bf91bb4264d488 (diff) | |
| parent | fbca4e9c7b2f723dde8e0034b7f5fedc9d0c8483 (diff) | |
| download | forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.gz forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.bz2 forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.tar.xz forums-635752fafc275c091cfc130e2f7b5e2ca5fe91d5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
[ticket/9509] Fix a typo and wrong period placement
[develop-olympus] Revert accidental revert of db update lang fix and version
[develop-olympus] Remove accidentally added trailing newlines.
[develop-olympus] Incrementing the version number to 3.0.9-dev.
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a1c3239cbf..5fc909c414 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.8-RC1'; +$updates_to_version = '3.0.9-dev'; // Enter any version to update from to test updates. The version within the db will not be updated. $debug_from_version = false; @@ -1681,7 +1681,7 @@ function change_database_data(&$no_updates, $version) "{$phpbb_root_path}language/$lang_dir/install.$phpEx", "{$phpbb_root_path}language/$lang_dir/acp/attachments.$phpEx", ); - + foreach ($lang_files as $lang_file) { if (!file_exists($lang_file)) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index cbee2c9ba1..355af802ef 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -242,7 +242,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.8-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-dev'); 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'); @@ -829,4 +829,4 @@ INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'mp3'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogg'); INSERT INTO phpbb_extensions (group_id, extension) VALUES (9, 'ogm'); -# POSTGRES COMMIT #
\ No newline at end of file +# POSTGRES COMMIT # |