7 files changed, 62 insertions, 68 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index c3bdf89866..0467cc7c35 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -109,7 +109,7 @@ class acp_board
 			case 'avatar':
 				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
-				sort($avatar_drivers);
+
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $driver)
 				{
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 75956736f7..23f6d775ef 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -282,7 +282,6 @@ class acp_groups
 				$user->add_lang('ucp');
 
 				// Setup avatar data for later
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 				$avatar_drivers = null;
 				$avatar_data = null;
@@ -290,8 +289,8 @@ class acp_groups
 
 				if ($config['allow_avatar'])
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the group_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($group_row);
@@ -334,27 +333,26 @@ class acp_groups
 					if ($config['allow_avatar'])
 					{
 						// Handle avatar
-						$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-						if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+						if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 						{
-							$avatar = $phpbb_avatar_manager->get_driver($driver);
-							$result = $avatar->process_form($template, $avatar_data, $avatar_error);
+							$driver = $phpbb_avatar_manager->get_driver($driver_name);
+							$result = $driver->process_form($template, $avatar_data, $avatar_error);
 
 							if ($result && empty($avatar_error))
 							{
-								$result['avatar_type'] = $driver;
+								$result['avatar_type'] = $driver_name;
 								
 								$submit_ary = array_merge($submit_ary, $result);
 							}
 						}
 						else
 						{
-							$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
-							if ($avatar)
+							$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
+							if ($driver)
 							{
-								$avatar->delete($avatar_data);
+								$driver->delete($avatar_data);
 							}
 
 							// Removing the avatar
@@ -526,7 +524,7 @@ class acp_groups
 
 					foreach ($avatar_drivers as $driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($driver);
 
 						$avatars_enabled = true;
 						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
@@ -534,7 +532,7 @@ class acp_groups
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+						if ($driver->prepare_form($template, $avatar_data, $avatar_error))
 						{
 							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
 							$driver_upper = strtoupper($driver_name);
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index d5532e35b6..3df373a7d4 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1733,12 +1733,11 @@ class acp_users
 				include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 
 				$avatars_enabled = false;
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 
 				if ($config['allow_avatar'])
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user_row);
@@ -1747,19 +1746,18 @@ class acp_users
 					{
 						if (check_form_key($form_name))
 						{
-							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+							$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $avatar_data, $error);
+								$driver = $phpbb_avatar_manager->get_driver($driver_name);
+								$result = $driver->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
 									$result = array(
-										'user_avatar_type' => $driver,
+										'user_avatar_type' => $driver_name,
 										'user_avatar' => $result['avatar'],
 										'user_avatar_width' => $result['avatar_width'],
 										'user_avatar_height' => $result['avatar_height'],
@@ -1775,10 +1773,10 @@ class acp_users
 							}
 							else
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
-								if ($avatar)
+								$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
+								if ($driver)
 								{
-									$avatar->delete($avatar_data);
+									$driver->delete($avatar_data);
 								}
 
 								// Removing the avatar
@@ -1805,19 +1803,19 @@ class acp_users
 
 					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user_row['user_avatar_type']));
 
-					foreach ($avatar_drivers as $driver)
+					foreach ($avatar_drivers as $current_driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
-						$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+						$config_name = preg_replace('#^avatar\.driver.#', '', $current_driver);
 						$template->set_filenames(array(
 							'avatar' => "acp_avatar_options_$config_name.html",
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($template, $avatar_data, $error))
 						{
-							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
 
 							$template->assign_block_vars('avatar_drivers', array(
@@ -1825,7 +1823,7 @@ class acp_users
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $focused_driver,
+								'SELECTED' => $current_driver == $focused_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}
@@ -1842,7 +1840,7 @@ class acp_users
 					}
 					else
 					{
-						$error[$key] = $user->lang("$lang");
+						$error[$key] = $user->lang($lang);
 					}
 				}
 
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index a0e1070322..176d0d659d 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -117,6 +117,7 @@ class phpbb_avatar_manager
 					self::$valid_drivers[$driver->get_name()] = $driver->get_name();
 				}
 			}
+			asort(self::$valid_drivers);
 		}
 	}
 
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f88d8c9054..6b267bc901 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1367,18 +1367,18 @@ function get_avatar($row, $alt, $ignore_config = false)
 	);
 
 	$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-	$avatar = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
+	$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
 	$html = '';
 
-	if ($avatar)
+	if ($driver)
 	{
-		$html = $avatar->get_custom_html($row, $ignore_config, $alt);
+		$html = $driver->get_custom_html($row, $ignore_config, $alt);
 		if (!empty($html))
 		{
 			return $html;
 		}
 
-		$avatar_data = $avatar->get_data($row, $ignore_config);
+		$avatar_data = $driver->get_data($row, $ignore_config);
 	}
 	else
 	{
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index f17e535b0c..c1ddaccb75 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -484,7 +484,6 @@ class ucp_groups
 						$error = array();
 
 						// Setup avatar data for later
-						$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 						$avatars_enabled = false;
 						$avatar_drivers = null;
 						$avatar_data = null;
@@ -492,8 +491,8 @@ class ucp_groups
 
 						if ($config['allow_avatar'])
 						{
+							$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 							$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-							sort($avatar_drivers);
 
 							// This is normalised data, without the group_ prefix
 							$avatar_data = phpbb_avatar_manager::clean_row($group_row);
@@ -521,26 +520,26 @@ class ucp_groups
 							if ($config['allow_avatar'])
 							{
 								// Handle avatar
-								$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-								$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+								$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
+								$config_name = preg_replace('#^avatar\.driver.#', '', $driver_name);
 
-								if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+								if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 								{
-									$avatar = $phpbb_avatar_manager->get_driver($driver);
-									$result = $avatar->process_form($template, $avatar_data, $avatar_error);
+									$driver = $phpbb_avatar_manager->get_driver($driver_name);
+									$result = $driver->process_form($template, $avatar_data, $avatar_error);
 
 									if ($result && empty($avatar_error))
 									{
-										$result['avatar_type'] = $driver;
+										$result['avatar_type'] = $driver_name;
 
 										$submit_ary = array_merge($submit_ary, $result);
 									}
 								}
 								else
 								{
-									if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+									if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 									{
-										$avatar->delete($avatar_data);
+										$driver->delete($avatar_data);
 									}
 
 									// Removing the avatar
@@ -649,25 +648,25 @@ class ucp_groups
 							$avatars_enabled = false;
 							$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $avatar_data['avatar_type']));
 
-							foreach ($avatar_drivers as $driver)
+							foreach ($avatar_drivers as $current_driver)
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
+								$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 								$avatars_enabled = true;
 								$template->set_filenames(array(
-									'avatar' => $avatar->get_template_name(),
+									'avatar' => $driver->get_template_name(),
 								));
 
-								if ($avatar->prepare_form($template, $avatar_data, $avatar_error))
+								if ($driver->prepare_form($template, $avatar_data, $avatar_error))
 								{
-									$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+									$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 									$driver_upper = strtoupper($driver_name);
 									$template->assign_block_vars('avatar_drivers', array(
 										'L_TITLE' => $user->lang($driver_upper . '_TITLE'),
 										'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 										'DRIVER' => $driver_name,
-										'SELECTED' => $driver == $focused_driver,
+										'SELECTED' => $current_driver == $focused_driver,
 										'OUTPUT' => $template->assign_display('avatar'),
 									));
 								}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f5c04bb432..71a4d4e67b 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -552,13 +552,12 @@ class ucp_profile
 
 				add_form_key('ucp_avatar');
 
-				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 				$avatars_enabled = false;
 
 				if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))
 				{
+					$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
 					$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
-					sort($avatar_drivers);
 
 					// This is normalised data, without the user_ prefix
 					$avatar_data = phpbb_avatar_manager::clean_row($user->data);
@@ -567,19 +566,18 @@ class ucp_profile
 					{
 						if (check_form_key('ucp_avatar'))
 						{
-							$driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar\.driver.#', '', $driver);
+							$driver_name = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', ''));
 
-							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && !$request->is_set_post('avatar_delete'))
+							if (in_array($driver_name, $avatar_drivers) && !$request->is_set_post('avatar_delete'))
 							{
-								$avatar = $phpbb_avatar_manager->get_driver($driver);
-								$result = $avatar->process_form($template, $avatar_data, $error);
+								$driver = $phpbb_avatar_manager->get_driver($driver_name);
+								$result = $driver->process_form($template, $avatar_data, $error);
 
 								if ($result && empty($error))
 								{
 									// Success! Lets save the result in the database
 									$result = array(
-										'user_avatar_type' => $driver,
+										'user_avatar_type' => $driver_name,
 										'user_avatar' => $result['avatar'],
 										'user_avatar_width' => $result['avatar_width'],
 										'user_avatar_height' => $result['avatar_height'],
@@ -598,9 +596,9 @@ class ucp_profile
 							}
 							else
 							{
-								if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
+								if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']))
 								{
-									$avatar->delete($avatar_data);
+									$driver->delete($avatar_data);
 								}
 
 								$result = array(
@@ -629,18 +627,18 @@ class ucp_profile
 
 					$focused_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type']));
 
-					foreach ($avatar_drivers as $driver)
+					foreach ($avatar_drivers as $current_driver)
 					{
-						$avatar = $phpbb_avatar_manager->get_driver($driver);
+						$driver = $phpbb_avatar_manager->get_driver($current_driver);
 
 						$avatars_enabled = true;
 						$template->set_filenames(array(
-							'avatar' => $avatar->get_template_name(),
+							'avatar' => $driver->get_template_name(),
 						));
 
-						if ($avatar->prepare_form($template, $avatar_data, $error))
+						if ($driver->prepare_form($template, $avatar_data, $error))
 						{
-							$driver_name = $phpbb_avatar_manager->prepare_driver_name($driver);
+							$driver_name = $phpbb_avatar_manager->prepare_driver_name($current_driver);
 							$driver_upper = strtoupper($driver_name);
 
 							$template->assign_block_vars('avatar_drivers', array(
@@ -648,7 +646,7 @@ class ucp_profile
 								'L_EXPLAIN' => $user->lang($driver_upper . '_EXPLAIN'),
 
 								'DRIVER' => $driver_name,
-								'SELECTED' => $driver == $focused_driver,
+								'SELECTED' => $current_driver == $focused_driver,
 								'OUTPUT' => $template->assign_display('avatar'),
 							));
 						}