mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 06:20:46 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4910 from javiexin/ticket/15331_B

Browse Source 
[ticket/15331] Allow gravatars to be overridden by existing event - B
This commit is contained in:
Marc Alexander
2017-10-17 21:13:40 +02:00
parent c1c3004fa1 e6796a690c
commit 0e9a1e0d54
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions.php
View File

@@ -4070,11 +4070,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
@@ -4082,7 +4077,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)
{ {