diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 17:07:35 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-05-03 17:07:35 +0200 |
| commit | 199d823f7a147ab913a273873c37dfcde7550db4 (patch) | |
| tree | bc466e6dad44b18878423c798aa70d301e64c98b | |
| parent | dde72c58b087c390c36ab12ba9e371f9fb0b2dfc (diff) | |
| download | forums-199d823f7a147ab913a273873c37dfcde7550db4.tar forums-199d823f7a147ab913a273873c37dfcde7550db4.tar.gz forums-199d823f7a147ab913a273873c37dfcde7550db4.tar.bz2 forums-199d823f7a147ab913a273873c37dfcde7550db4.tar.xz forums-199d823f7a147ab913a273873c37dfcde7550db4.zip | |
[prep-release-3.1.4] Update version to 3.1.4
| -rw-r--r-- | build/build.xml | 4 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml index 0fb887dd25..8edee83d03 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.4-RC2" /> + <property name="newversion" value="3.1.4" /> <property name="prevversion" value="3.1.3" /> - <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.4-RC1" /> + <property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.4-RC1, 3.1.4-RC2" /> <!-- 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 385b205b27..628e26b083 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.4-RC2'); +define('PHPBB_VERSION', '3.1.4'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 79a536bfe4..fbc26fde9a 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.4-RC2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.4'); 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'); |