aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-23 01:48:38 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-23 01:48:38 +0200
commitd640a379840f923b86cfe937f4870cdb6ebd9279 (patch)
tree6392c1cf8dd3a8b703f6f00ad3310840ec5acfd4 /phpBB
parente4c8e4905c327b73252667f09500b3248c55e86c (diff)
downloadforums-d640a379840f923b86cfe937f4870cdb6ebd9279.tar
forums-d640a379840f923b86cfe937f4870cdb6ebd9279.tar.gz
forums-d640a379840f923b86cfe937f4870cdb6ebd9279.tar.bz2
forums-d640a379840f923b86cfe937f4870cdb6ebd9279.tar.xz
forums-d640a379840f923b86cfe937f4870cdb6ebd9279.zip
[prep-release-3.1.0-RC6] Update version to 3.1.0-RC6
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/constants.php2
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/styles/prosilver/style.cfg4
-rw-r--r--phpBB/styles/subsilver2/style.cfg4
5 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 6693b822fe..4112061695 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/
// phpBB Version
-define('PHPBB_VERSION', '3.1.0-RC6-dev');
+define('PHPBB_VERSION', '3.1.0-RC6');
// QA-related
// define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index cab3fd7f1f..983c11cc98 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.0-RC5',
+ 'phpbb_version' => '3.1.0-RC6',
'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 adbd5a540e..1a2d67ea81 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.0-RC6-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC6');
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');
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index 8853bd4382..90d6bd8e8a 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = prosilver
copyright = © phpBB Limited, 2007
-style_version = 3.1.0-RC5
-phpbb_version = 3.1.0-RC5
+style_version = 3.1.0-RC6
+phpbb_version = 3.1.0-RC6
# Defining a different template bitfield
# template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index b8de165608..0cffcee156 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -21,8 +21,8 @@
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Limited
-style_version = 3.1.0-RC5
-phpbb_version = 3.1.0-RC5
+style_version = 3.1.0-RC6
+phpbb_version = 3.1.0-RC6
# Defining a different template bitfield
# template_bitfield = lNg=