makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-10-17 21:16:15 +02:00
commit f2f1037e8d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/functions.php
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)
{ {