aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-12-01 14:59:43 +0100
committerMarc Alexander <admin@m-a-styles.de>2015-12-03 11:58:53 +0100
commit7705017f6381ec4fad769069ba84f12ba2e5c316 (patch)
treee81d44eca9d9a31a633787cbd3ca1425be27cb86 /phpBB/includes/acp/acp_users.php
parentc99386e1553170a898f292d0c0717a5c1fa8151b (diff)
downloadforums-7705017f6381ec4fad769069ba84f12ba2e5c316.tar
forums-7705017f6381ec4fad769069ba84f12ba2e5c316.tar.gz
forums-7705017f6381ec4fad769069ba84f12ba2e5c316.tar.bz2
forums-7705017f6381ec4fad769069ba84f12ba2e5c316.tar.xz
forums-7705017f6381ec4fad769069ba84f12ba2e5c316.zip
[ticket/14272] Make sure phpbb_avatar_manager was defined
PHPBB3-14272
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 4d0bbf5721..febdcb93ed 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -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