1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander
2017-10-17 21:16:15 +02:00

View File

@@ -4050,11 +4050,6 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
if ($driver) if ($driver)
{ {
$html = $driver->get_custom_html($user, $row, $alt); $html = $driver->get_custom_html($user, $row, $alt);
if (!empty($html))
{
return $html;
}
$avatar_data = $driver->get_data($row); $avatar_data = $driver->get_data($row);
} }
else else
@@ -4062,7 +4057,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false)
$avatar_data['src'] = ''; $avatar_data['src'] = '';
} }
if (!empty($avatar_data['src'])) if (empty($html) && !empty($avatar_data['src']))
{ {
if ($lazy) if ($lazy)
{ {