From e14c3f3b77ab07ce97f357a15db5db5101df06c1 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sun, 1 Jan 2012 16:00:17 +0100
Subject: [PATCH] [prep-release-3.0.10] Bumping version number for 3.0.10
 final.

---
 build/build.xml                       | 4 ++--
 phpBB/includes/constants.php          | 2 +-
 phpBB/install/database_update.php     | 8 +++++++-
 phpBB/install/schemas/schema_data.sql | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index bf4c97297b..3d8d3de640 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.10-RC3" />
+	<property name="newversion" value="3.0.10" />
 	<property name="prevversion" value="3.0.9" />
-	<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.10-RC1, 3.0.10-RC2" />
+	<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.10-RC1, 3.0.10-RC2, 3.0.10-RC3" />
 	<!-- 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 3a798fc1ce..b70cf5bc59 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.10-RC3');
+define('PHPBB_VERSION', '3.0.10');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index eeadc9f862..5694c6e29f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-define('UPDATES_TO_VERSION', '3.0.10-RC3');
+define('UPDATES_TO_VERSION', '3.0.10');
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 define('DEBUG_FROM_VERSION', false);
@@ -991,6 +991,8 @@ function database_update_info()
 		'3.0.10-RC1'	=> array(),
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		'3.0.10-RC2'	=> array(),
+		// No changes from 3.0.10-RC3 to 3.0.10
+		'3.0.10-RC3'	=> array(),
 
 		/** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */
 	);
@@ -2018,6 +2020,10 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.10-RC2 to 3.0.10-RC3
 		case '3.0.10-RC2':
 		break;
+
+		// No changes from 3.0.10-RC3 to 3.0.10
+		case '3.0.10-RC3':
+		break;
 	}
 }
 
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index eb90d3a06d..d7433d52fd 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.10-RC3');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.10');
 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');