1 files changed, 35 insertions, 0 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 30592b995d..b47bcbd2cb 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1131,9 +1131,11 @@ function database_update_info()
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
+					'group_avatar_type'		=> array('VCHAR:255', ''),
 				),
 				USERS_TABLE			=> array(
 					'user_timezone'		=> array('VCHAR:100', ''),
+					'user_avatar_type'		=> array('VCHAR:255', ''),
 				),
 			),
 		),
@@ -2731,6 +2733,39 @@ function change_database_data(&$no_updates, $version)
 				$config->set('display_last_subject', '1');
 			}
 
+			// Update avatars to modular types
+			$avatar_type_map = array(
+				AVATAR_UPLOAD	=> 'avatar.driver.upload',
+				AVATAR_GALLERY	=> 'avatar.driver.local',
+				AVATAR_REMOTE	=> 'avatar.driver.remote',
+			);
+
+			foreach ($avatar_type_map as $old => $new)
+			{
+				$sql = 'UPDATE ' . USERS_TABLE . "
+					SET user_avatar_type = '" . $new . "'
+					WHERE user_avatar_type = '" . $old . "'";
+				_sql($sql, $errored, $error_ary);
+
+				$sql = 'UPDATE ' . GROUPS_TABLE . "
+					SET group_avatar_type = '" . $new . "'
+					WHERE group_avatar_type = '" . $old . "'";
+				_sql($sql, $errored, $error_ary);
+			}
+
+			// update avatar module_auth
+			$sql = 'UPDATE ' . MODULES_TABLE . "
+				SET module_auth = 'cfg_allow_avatar && (cfg_allow_avatar_local || cfg_allow_avatar_remote || cfg_allow_avatar_upload || cfg_allow_avatar_remote_upload || cfg_allow_avatar_gravatar)'
+				WHERE module_class = 'ucp'
+					AND module_basename = 'ucp_profile'
+					AND module_mode = 'avatar'";
+			_sql($sql, $errored, $error_ary);
+
+			if (!isset($config['allow_avatar_gravatar']))
+			{
+				$config->set('allow_avatar_gravatar', '0');
+			}
+
 			if (!isset($config['assets_version']))
 			{
 				$config->set('assets_version', '1');