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: [feature/avatars] Use seperate function for retrieving all drivers

PHPBB3-10018
---
 phpBB/includes/avatar/manager.php | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

(limited to 'phpBB/includes/avatar')

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)
 		{
-- 
cgit v1.2.1