[3.0.x] Bump version numbers for 3.0.14-RC1 release.

This commit is contained in:
Andreas Fischer 2015-04-27 23:22:44 +02:00
parent cd6c0427fb
commit ce74a0bd6c
4 changed files with 19 additions and 7 deletions

View file

@ -2,7 +2,7 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="3.0.14-dev" /> <property name="newversion" value="3.0.14-RC1" />
<property name="prevversion" value="3.0.13-PL1" /> <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="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" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->

View file

@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/ */
// phpBB Version // phpBB Version
define('PHPBB_VERSION', '3.0.14-dev'); define('PHPBB_VERSION', '3.0.14-RC1');
// QA-related // QA-related
// define('PHPBB_QA', 1); // define('PHPBB_QA', 1);

View file

@ -8,7 +8,7 @@
* *
*/ */
define('UPDATES_TO_VERSION', '3.0.14-dev'); define('UPDATES_TO_VERSION', '3.0.14-RC1');
// Enter any version to update from to test updates. The version within the db will not be updated. // Enter any version to update from to test updates. The version within the db will not be updated.
define('DEBUG_FROM_VERSION', false); define('DEBUG_FROM_VERSION', false);
@ -949,7 +949,7 @@ function database_update_info()
// this column was removed from the database updater // this column was removed from the database updater
// after 3.0.9-RC3 was released. It might still exist // after 3.0.9-RC3 was released. It might still exist
// in 3.0.9-RCX installations and has to be dropped in // in 3.0.9-RCX installations and has to be dropped in
// 3.0.14 after the db_tools class is capable of properly // 3.0.15 after the db_tools class is capable of properly
// removing a primary key. // removing a primary key.
// 'attempt_id' => array('UINT', NULL, 'auto_increment'), // 'attempt_id' => array('UINT', NULL, 'auto_increment'),
'attempt_ip' => array('VCHAR:40', ''), 'attempt_ip' => array('VCHAR:40', ''),
@ -1015,8 +1015,12 @@ function database_update_info()
'3.0.12' => array(), '3.0.12' => array(),
// No changes from 3.0.13-RC1 to 3.0.13 // No changes from 3.0.13-RC1 to 3.0.13
'3.0.13-RC1' => array(), '3.0.13-RC1' => array(),
// No changes from 3.0.13 to 3.0.13-PL1
'3.0.13' => array(),
// No changes from 3.0.13-PL1 to 3.0.14-RC1
'3.0.13-PL1' => array(),
/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.14-RC1 */ /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.15-RC1 */
); );
} }
@ -2266,6 +2270,14 @@ function change_database_data(&$no_updates, $version)
// No changes from 3.0.13-RC1 to 3.0.13 // No changes from 3.0.13-RC1 to 3.0.13
case '3.0.13-RC1': case '3.0.13-RC1':
break; break;
// No changes from 3.0.13 to 3.0.13-PL1
case '3.0.13':
break;
// No changes from 3.0.13-PL1 to 3.0.14-RC1
case '3.0.13-PL1':
break;
} }
} }

View file

@ -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 ('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_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 ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14-RC1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); 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'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');