1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
This commit is contained in:
Tristan Darricau 2015-08-28 16:28:59 +02:00
commit 9e0a075be1

View File

@ -4020,7 +4020,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
/* @var $phpbb_avatar_manager \phpbb\avatar\manager */
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config);
$driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], !$ignore_config);
$html = '';
if ($driver)