mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 11:13:59 +02:00
[feature/avatars] Only create avatar objects if necessary
PHPBB3-10018
This commit is contained in:
@@ -27,7 +27,7 @@ class ucp_groups
|
||||
{
|
||||
global $config, $phpbb_root_path, $phpEx;
|
||||
global $db, $user, $auth, $cache, $template;
|
||||
global $request, $phpbb_avatar_manager;
|
||||
global $request, $phpbb_container;
|
||||
|
||||
$user->add_lang('groups');
|
||||
|
||||
@@ -484,6 +484,7 @@ class ucp_groups
|
||||
$error = array();
|
||||
|
||||
// Setup avatar data for later
|
||||
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
|
||||
$avatars_enabled = false;
|
||||
$avatar_drivers = null;
|
||||
$avatar_data = null;
|
||||
|
@@ -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'))
|
||||
|
Reference in New Issue
Block a user