diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-10-17 21:13:40 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-10-17 21:13:40 +0200 |
| commit | 0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4 (patch) | |
| tree | 65542148b56bf61fc86d0d56d71680afe396bfcd /phpBB | |
| parent | c1c3004fa1d0dbc739b5b2692a3e1afa0894e035 (diff) | |
| parent | e6796a690cde17ad5f671821fc18911d0c8f1a30 (diff) | |
| download | forums-0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4.tar forums-0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4.tar.gz forums-0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4.tar.bz2 forums-0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4.tar.xz forums-0e9a1e0d5490eb0fcb795c29b1b5e372de1c64f4.zip | |
Merge pull request #4910 from javiexin/ticket/15331_B
[ticket/15331] Allow gravatars to be overridden by existing event - B
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 43d8cce3c4..2cd62d7bac 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4070,11 +4070,6 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) if ($driver) { $html = $driver->get_custom_html($user, $row, $alt); - if (!empty($html)) - { - return $html; - } - $avatar_data = $driver->get_data($row); } else @@ -4082,7 +4077,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) $avatar_data['src'] = ''; } - if (!empty($avatar_data['src'])) + if (empty($html) && !empty($avatar_data['src'])) { if ($lazy) { |