aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_board.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/acp/acp_board.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/acp/acp_board.php')
-rw-r--r--phpBB/includes/acp/acp_board.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 5852f512cd..95da62dedf 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -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();