aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_profile.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-11-25 14:33:13 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-11-25 14:33:13 +0100
commit67c2e48d15d6e4ddd244dd2e126f906ed25be1ef (patch)
treeb7cc556f030a8ba266d65ca6428f939d5a2f9b7b /phpBB/includes/ucp/ucp_profile.php
parentce5e2f16777ae5319fcb902ee58005a4caced7e6 (diff)
downloadforums-67c2e48d15d6e4ddd244dd2e126f906ed25be1ef.tar
forums-67c2e48d15d6e4ddd244dd2e126f906ed25be1ef.tar.gz
forums-67c2e48d15d6e4ddd244dd2e126f906ed25be1ef.tar.bz2
forums-67c2e48d15d6e4ddd244dd2e126f906ed25be1ef.tar.xz
forums-67c2e48d15d6e4ddd244dd2e126f906ed25be1ef.zip
[feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
-rw-r--r--phpBB/includes/ucp/ucp_profile.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 402db86c1d..3945fc537a 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -30,7 +30,7 @@ class ucp_profile
{
global $cache, $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx;
global $request;
- global $phpbb_avatar_manager;
+ global $phpbb_container;
$user->add_lang('posting');
@@ -549,6 +549,7 @@ class ucp_profile
add_form_key('ucp_avatar');
+ $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatars_enabled = false;
if ($config['allow_avatar'] && $auth->acl_get('u_chgavatar'))