mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity

[ticket/14272] Make sure phpbb_avatar_manager was defined

Browse Source 
PHPBB3-14272
This commit is contained in:
Marc Alexander 2015-12-01 14:59:43 +01:00
parent c99386e155
commit 7705017f63
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_groups.php
View File

@ -324,9 +324,11 @@ class acp_groups
$avatar_data = null;
$avatar_error = array();
/** @var \phpbb\avatar\manager $phpbb_avatar_manager */
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
if ($config['allow_avatar'])
{
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix

3
phpBB/includes/acp/acp_users.php
View File

@ -1809,10 +1809,11 @@ class acp_users
case 'avatar':
$avatars_enabled = false;
/** @var \phpbb\avatar\manager $phpbb_avatar_manager */
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
if ($config['allow_avatar'])
{
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the user_ prefix

4
phpBB/includes/ucp/ucp_groups.php
View File

@ -462,9 +462,11 @@ class ucp_groups
$avatar_data = null;
$avatar_error = array();
/** @var \phpbb\avatar\manager $phpbb_avatar_manager */
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
if ($config['allow_avatar'])
{
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_enabled_drivers();
// This is normalised data, without the group_ prefix