diff options
| author | javiexin <javiexin@gmail.com> | 2017-08-19 22:36:47 +0200 |
|---|---|---|
| committer | javiexin <javiexin@gmail.com> | 2017-08-19 22:36:47 +0200 |
| commit | e6796a690cde17ad5f671821fc18911d0c8f1a30 (patch) | |
| tree | 1bccecb49911b525d4d48c6eaf13ef46f40537fa /phpBB/includes/functions.php | |
| parent | fa3bdedf7bebd64336daaeff7c41b842fa098cf9 (diff) | |
| download | forums-e6796a690cde17ad5f671821fc18911d0c8f1a30.tar forums-e6796a690cde17ad5f671821fc18911d0c8f1a30.tar.gz forums-e6796a690cde17ad5f671821fc18911d0c8f1a30.tar.bz2 forums-e6796a690cde17ad5f671821fc18911d0c8f1a30.tar.xz forums-e6796a690cde17ad5f671821fc18911d0c8f1a30.zip | |
[ticket/15331] Allow gravatars to be changed in the existing event
Option B:
- change the get_avatar function
PHPBB3-15331
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 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) { |