makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Use seperate function for retrieving all drivers

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-12-04 00:59:37 +01:00
parent b42ca792fd
commit fc4069f81d
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_board.php
View file

@ -108,7 +108,7 @@ class acp_board
case 'avatar': case 'avatar':
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $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(); $avatar_vars = array();
foreach ($avatar_drivers as $current_driver) foreach ($avatar_drivers as $current_driver)

25
phpBB/includes/avatar/manager.php
View file

@ -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 * @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) if (self::$valid_drivers === false)
{ {

2
tests/avatar/manager_test.php
View file

@ -47,7 +47,7 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
public function test_get_valid_drivers() 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->assertArrayHasKey('avatar.driver.foobar', $valid_drivers);
$this->assertEquals('avatar.driver.foobar', $valid_drivers['avatar.driver.foobar']); $this->assertEquals('avatar.driver.foobar', $valid_drivers['avatar.driver.foobar']);
} }