mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-20 23:41:29 +02:00
[ticket/16955] Clean up avatar classes
PHPBB3-16955
This commit is contained in:
@@ -29,7 +29,7 @@ class manager
|
||||
|
||||
/**
|
||||
* Array that contains a list of enabled drivers
|
||||
* @var array|bool
|
||||
* @var array|false
|
||||
*/
|
||||
protected static $enabled_drivers = false;
|
||||
|
||||
@@ -87,7 +87,7 @@ class manager
|
||||
* @param string $avatar_type Avatar type; by default an avatar's service container name
|
||||
* @param bool $load_enabled Load only enabled avatars
|
||||
*
|
||||
* @return object Avatar driver object
|
||||
* @return object|null Avatar driver object
|
||||
*/
|
||||
public function get_driver($avatar_type, $load_enabled = true)
|
||||
{
|
||||
@@ -181,7 +181,7 @@ class manager
|
||||
$this->load_enabled_drivers();
|
||||
}
|
||||
|
||||
return self::$enabled_drivers;
|
||||
return self::$enabled_drivers ?: [];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -254,7 +254,7 @@ class manager
|
||||
{
|
||||
$config_name = $driver->get_config_name();
|
||||
|
||||
return $this->config["allow_avatar_{$config_name}"];
|
||||
return (bool) $this->config["allow_avatar_{$config_name}"];
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user