diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 12:22:02 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-23 12:22:02 +0200 |
| commit | 80a9c24b6b33d14cb3ffed0d25973496335c9200 (patch) | |
| tree | 521c306b37fc04d9f80df536502ee3e8c74a2b7e /phpBB | |
| parent | 08f365236acb48f9017b6e978a9b9c50ab5ed960 (diff) | |
| download | forums-80a9c24b6b33d14cb3ffed0d25973496335c9200.tar forums-80a9c24b6b33d14cb3ffed0d25973496335c9200.tar.gz forums-80a9c24b6b33d14cb3ffed0d25973496335c9200.tar.bz2 forums-80a9c24b6b33d14cb3ffed0d25973496335c9200.tar.xz forums-80a9c24b6b33d14cb3ffed0d25973496335c9200.zip | |
[prep-release-3.1.0] Update version to 3.1.0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/style.cfg | 4 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/style.cfg | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index b4bb2722c3..76c3834c91 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-RC7-dev'); +define('PHPBB_VERSION', '3.1.0'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 983c11cc98..8f6af30426 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-RC6', + 'phpbb_version' => '3.1.0', '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 f40b1a4d44..bc4a9f7fe1 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-RC7-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0'); 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 90d6bd8e8a..de7b38c90b 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-RC6 -phpbb_version = 3.1.0-RC6 +style_version = 3.1.0 +phpbb_version = 3.1.0 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 0cffcee156..685e876cc7 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-RC6 -phpbb_version = 3.1.0-RC6 +style_version = 3.1.0 +phpbb_version = 3.1.0 # Defining a different template bitfield # template_bitfield = lNg= |