aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-04-09 19:48:35 +0200
committerJoas Schilling <nickvergessen@gmx.de>2016-04-09 19:48:35 +0200
commitc4ef83e4d27320df74956ace54ab1b57785a21bf (patch)
tree77ac640e5729c1e36b636d84d3a2976b77ccb826 /phpBB/install
parent2ae17d6caf1650f76b585290d476bce4fe08a6fe (diff)
parente7043dc04452ccebf06e80cb8a7cf38b2ff44ce0 (diff)
downloadforums-c4ef83e4d27320df74956ace54ab1b57785a21bf.tar
forums-c4ef83e4d27320df74956ace54ab1b57785a21bf.tar.gz
forums-c4ef83e4d27320df74956ace54ab1b57785a21bf.tar.bz2
forums-c4ef83e4d27320df74956ace54ab1b57785a21bf.tar.xz
forums-c4ef83e4d27320df74956ace54ab1b57785a21bf.zip
Merge branch 'prep-release-3.1.9' into 3.1.x
Diffstat (limited to 'phpBB/install')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index b670678cf3..838ce1a682 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3',
- 'phpbb_version' => '3.1.8',
+ 'phpbb_version' => '3.1.9',
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
'dbms' => $dbms,
'dbhost' => $dbhost,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 179d890a8e..84d0cb3e59 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -273,7 +273,7 @@ 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 ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.9-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.9-RC1');
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');