diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 14:33:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 14:33:13 +0100 |
| commit | 67c2e48d15d6e4ddd244dd2e126f906ed25be1ef (patch) | |
| tree | b7cc556f030a8ba266d65ca6428f939d5a2f9b7b /phpBB/includes/functions_display.php | |
| parent | ce5e2f16777ae5319fcb902ee58005a4caced7e6 (diff) | |
| download | forums-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/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index bf1611a5de..669641de70 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1353,7 +1353,7 @@ function get_avatar($row, $alt, $ignore_config = false) { global $user, $config, $cache, $phpbb_root_path, $phpEx; global $request; - global $phpbb_avatar_manager; + global $phpbb_container; if (!$config['allow_avatar'] && !$ignore_config) { @@ -1366,6 +1366,7 @@ function get_avatar($row, $alt, $ignore_config = false) 'height' => $row['avatar_height'], ); + $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']); if ($avatar) |