diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 17:42:55 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 17:42:55 +0200 |
commit | 04ef19595ceffadaa97292916f859977d51e586e (patch) | |
tree | 68455079e9e8d7f312c92661f328d26ce5949b37 | |
parent | 71f9c6ebe53648b4d9883e725bde3d836de8303d (diff) | |
download | forums-04ef19595ceffadaa97292916f859977d51e586e.tar forums-04ef19595ceffadaa97292916f859977d51e586e.tar.gz forums-04ef19595ceffadaa97292916f859977d51e586e.tar.bz2 forums-04ef19595ceffadaa97292916f859977d51e586e.tar.xz forums-04ef19595ceffadaa97292916f859977d51e586e.zip |
[prep-release-3.1.11] Update version numbers to 3.1.11-RC1
-rw-r--r-- | build/build.xml | 6 | ||||
-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 |
6 files changed, 10 insertions, 10 deletions
diff --git a/build/build.xml b/build/build.xml index cc29aec654..3a73e09410 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- a few settings for the build --> - <property name="newversion" value="3.1.10" /> - <property name="prevversion" value="3.1.9" /> - <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8" /> + <property name="newversion" value="3.1.11-RC1" /> + <property name="prevversion" value="3.1.10" /> + <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9" /> <!-- no configuration should be needed beyond this point --> <property name="oldversions" value="${olderversions}, ${prevversion}" /> diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 23839e3d9a..79f5a6f30f 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.10'); +define('PHPBB_VERSION', '3.1.11-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 2afec68de6..4aca80188a 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.10', + 'phpbb_version' => '3.1.11', '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 3449829d8c..22a539e186 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.10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.11-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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 300a83164b..019db11bc7 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.10 -phpbb_version = 3.1.10 +style_version = 3.1.11 +phpbb_version = 3.1.11 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 4c9abcc02d..65d846402d 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.10 -phpbb_version = 3.1.10 +style_version = 3.1.11 +phpbb_version = 3.1.11 # Defining a different template bitfield # template_bitfield = lNg= |