From e6796a690cde17ad5f671821fc18911d0c8f1a30 Mon Sep 17 00:00:00 2001 From: javiexin Date: Sat, 19 Aug 2017 22:36:47 +0200 Subject: [PATCH] [ticket/15331] Allow gravatars to be changed in the existing event Option B: - change the get_avatar function PHPBB3-15331 --- phpBB/includes/functions.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 84178f74e4..be41af0aa1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4902,11 +4902,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 @@ -4914,7 +4909,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) {