3 files changed, 27 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 7ef76535d3..ce223cf302 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -8,7 +8,7 @@
 *
 */
 
-$updates_to_version = '3.0.6-RC2';
+$updates_to_version = '3.0.6-RC3';
 
 // Enter any version to update from to test updates. The version within the db will not be updated.
 $debug_from_version = false;
@@ -883,6 +883,8 @@ function database_update_info()
 				LOG_TABLE			=> array('log_time'),
 			),
 		),
+		// No changes from 3.0.6-RC2 to 3.0.6-RC3
+		'3.0.6-RC2'		=> array(),
 	);
 }
 
@@ -1513,6 +1515,19 @@ function change_database_data(&$no_updates, $version)
 		// No changes from 3.0.6-RC1 to 3.0.6-RC2
 		case '3.0.6-RC1':
 		break;
+
+		// Changes from 3.0.6-RC2 to 3.0.6-RC3
+		case '3.0.6-RC2':
+
+			// Update the Custom Profile Fields based on previous settings to the new format
+			$sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . '
+				SET field_show_on_vt = 1
+				WHERE field_hide = 0
+					AND (field_required = 1 OR field_show_on_reg = 1 OR field_show_profile = 1)';
+			_sql($sql, $errored, $error_ary);
+			$no_updates = false;
+
+		break;
 	}
 }
 
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index ab7ec35705..6adebc7a64 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -262,6 +262,16 @@ class install_update extends module
 					$template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']);
 				}
 
+				// Since some people try to update to RC releases, but phpBB.com tells them the last version is the version they currently run
+				// we are faced with the updater thinking the database schema is up-to-date; which it is, but should be updated none-the-less
+				// We now try to cope with this by triggering the update process
+				if (version_compare(str_replace('rc', 'RC', strtolower($this->current_version)), str_replace('rc', 'RC', strtolower($this->update_info['version']['to'])), '<'))
+				{
+					$template->assign_vars(array(
+						'S_UP_TO_DATE'		=> false,
+					));
+				}
+
 			break;
 
 			case 'update_db':
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 18bd8d8e9a..312d317b3f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -239,7 +239,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.6-RC2');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC3');
 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');