diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 14:40:50 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-05-03 14:40:50 +0200 |
| commit | 5382552fc8ce84cb82153363b95bd2362275d628 (patch) | |
| tree | 34e29da403f3be352836040f5ee86b9d951c3e50 | |
| parent | 1a3350619f428d9d69d196c52128727e27ef2f04 (diff) | |
| download | forums-5382552fc8ce84cb82153363b95bd2362275d628.tar forums-5382552fc8ce84cb82153363b95bd2362275d628.tar.gz forums-5382552fc8ce84cb82153363b95bd2362275d628.tar.bz2 forums-5382552fc8ce84cb82153363b95bd2362275d628.tar.xz forums-5382552fc8ce84cb82153363b95bd2362275d628.zip | |
[prep-release-3.0.14] Bump version numbers for 3.0.14 release.
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 8 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/build/build.xml b/build/build.xml index 27e34bf6bb..ea98842f85 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.0.14-RC1" /> - <property name="prevversion" value="3.0.13-PL1" /> - <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13" /> + <property name="newversion" value="3.0.14" /> + <property name="prevversion" value="3.0.14-RC1" /> + <property name="olderversions" value="3.0.2, 3.0.3, 3.0.4, 3.0.5, 3.0.6, 3.0.7, 3.0.7-PL1, 3.0.8, 3.0.9, 3.0.10, 3.0.11, 3.0.12, 3.0.13, 3.0.13-PL1" /> <!-- 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 97943574cb..e8a3191280 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.14-RC1'); +define('PHPBB_VERSION', '3.0.14'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index f81576fea6..a8c3ed385f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.14-RC1'); +define('UPDATES_TO_VERSION', '3.0.14'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -1019,6 +1019,8 @@ function database_update_info() '3.0.13' => array(), // No changes from 3.0.13-PL1 to 3.0.14-RC1 '3.0.13-PL1' => array(), + // No changes from 3.0.14-RC1 to 3.0.14 + '3.0.14-RC1' => array(), /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.15-RC1 */ ); @@ -2278,6 +2280,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.13-PL1 to 3.0.14-RC1 case '3.0.13-PL1': break; + + // No changes from 3.0.14-RC1 to 3.0.14 + case '3.0.14-RC1': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 462ba0c3ff..4534c19a7f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', 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 ('version', '3.0.14-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14'); 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'); |