mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Only create avatar objects if necessary

Browse Source 
PHPBB3-10018
This commit is contained in:
Marc Alexander
2012-11-25 14:33:13 +01:00
parent ce5e2f1677
commit 67c2e48d15
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class acp_board
{
global $db, $user, $auth, $template;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
global $cache, $phpbb_avatar_manager;
global $cache, $phpbb_container;
$user->add_lang('acp/board');
@@ -107,6 +107,7 @@ class acp_board
break;
case 'avatar':
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();
sort($avatar_drivers);
$avatar_vars = array();

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

@@ -26,7 +26,7 @@ class acp_groups
{
global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
global $request, $phpbb_avatar_manager;
global $request, $phpbb_container;
$user->add_lang('acp/groups');
$this->tpl_name = 'acp_groups';
@@ -282,6 +282,7 @@ class acp_groups
$user->add_lang('ucp');
// Setup avatar data for later
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$avatars_enabled = false;
$avatar_drivers = null;
$avatar_data = null;

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

@@ -33,7 +33,7 @@ class acp_users
global $config, $db, $user, $auth, $template, $cache;
global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $file_uploads;
global $phpbb_dispatcher, $request;
global $phpbb_avatar_manager;
global $phpbb_container;
$user->add_lang(array('posting', 'ucp', 'acp/users'));
$this->tpl_name = 'acp_users';
@@ -468,6 +468,7 @@ class acp_users
$db->sql_query($sql);
// Delete old avatar if present
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$driver = $phpbb_avatar_manager->get_driver($user_row['user_avatar_type']);
if ($driver)
{
@@ -1732,6 +1733,8 @@ class acp_users
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
$avatars_enabled = false;
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
if ($config['allow_avatar'])
{
$avatar_drivers = $phpbb_avatar_manager->get_valid_drivers();