mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Let avatar manager handle $ignore_config

Browse Source 
The avatar manager already handles if avatars are enabled. It should also
handle ignoring the config settings.

PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-30 15:12:34 +01:00
parent 562ebe5c12
commit d5cbedaaa2
8 changed files with 35 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/avatar/manager.php
View File

@@ -54,15 +54,16 @@ class phpbb_avatar_manager
/**
* Get the driver object specified by the avatar type
*
* @param string Avatar type; by default an avatar's service container name
* @param string $avatar_type Avatar type; by default an avatar's service container name
* @param bool $force_all Grab all avatar drivers, no matter if enabled or not
*
* @return object Avatar driver object
*/
public function get_driver($avatar_type)
public function get_driver($avatar_type, $force_all = false)
{
if (self::$valid_drivers === false)
if (self::$valid_drivers === false || $force_all)
{
$this->load_valid_drivers();
$this->load_valid_drivers($force_all);
}
// Legacy stuff...