From fc4069f81df54630a5ac8c1373c38f4834553012 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Tue, 4 Dec 2012 00:59:37 +0100
Subject: [PATCH] [feature/avatars] Use seperate function for retrieving all
 drivers

PHPBB3-10018
---
 phpBB/includes/acp/acp_board.php  |  2 +-
 phpBB/includes/avatar/manager.php | 25 ++++++++++++++++++++++---
 tests/avatar/manager_test.php     |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index bb90918a46..9e63e59403 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -108,7 +108,7 @@ class acp_board
 
 			case 'avatar':
 				$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
-				$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true);
+				$avatar_drivers = $phpbb_avatar_manager->get_all_drivers();
 
 				$avatar_vars = array();
 				foreach ($avatar_drivers as $current_driver)
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index e7ee323624..279278b71c 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -109,13 +109,32 @@ class phpbb_avatar_manager
 	}
 
 	/**
-	* Get a list of valid avatar drivers
+	* Get a list of all avatar drivers
 	*
-	* @param bool $force_all Force showing all avatar drivers
+	* @return array Array containing a list of all avatar drivers
+	*/
+	public function get_all_drivers()
+	{
+		$drivers = array();
+
+		if (!empty($this->avatar_drivers))
+		{
+			foreach ($this->avatar_drivers as $driver)
+			{
+				$drivers[$driver->get_name()] = $driver->get_name();
+			}
+			asort($drivers);
+		}
+
+		return $drivers;
+	}
+
+	/**
+	* Get a list of valid avatar drivers
 	*
 	* @return array Array containing a list of the valid avatar drivers
 	*/
-	public function get_valid_drivers($force_all = false)
+	public function get_valid_drivers()
 	{
 		if (self::$valid_drivers === false)
 		{
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index 9f28e1522d..af0a2edccc 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -47,7 +47,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
 
 	public function test_get_valid_drivers()
 	{
-		$valid_drivers = $this->manager->get_valid_drivers(true);
+		$valid_drivers = $this->manager->get_all_drivers();
 		$this->assertArrayHasKey('avatar.driver.foobar', $valid_drivers);
 		$this->assertEquals('avatar.driver.foobar', $valid_drivers['avatar.driver.foobar']);
 	}