diff options
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 20 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 |
4 files changed, 19 insertions, 7 deletions
diff --git a/build/build.xml b/build/build.xml index b5fe185530..27e34bf6bb 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ <project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <!-- 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="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 --> diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index b0e814cc6a..97943574cb 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-dev'); +define('PHPBB_VERSION', '3.0.14-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5c0ead437d..f81576fea6 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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. define('DEBUG_FROM_VERSION', false); @@ -949,7 +949,7 @@ function database_update_info() // this column was removed from the database updater // after 3.0.9-RC3 was released. It might still exist // 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. // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), @@ -1014,9 +1014,13 @@ function database_update_info() // No changes from 3.0.12 to 3.0.13-RC1 '3.0.12' => array(), // 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 case '3.0.13-RC1': 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; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 3e6dc95853..462ba0c3ff 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-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_gc', '14400'); |