diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-29 23:08:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-29 23:08:29 +0100 |
| commit | 81a1a21185abfc230097a355216d6c6b99511b20 (patch) | |
| tree | da241a139d9004c6a3303bce494a46d4aceb84e7 /phpBB/includes/functions_display.php | |
| parent | cb1d98ab7f588a38fcae680aca839b805caf2a23 (diff) | |
| download | forums-81a1a21185abfc230097a355216d6c6b99511b20.tar forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.gz forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.bz2 forums-81a1a21185abfc230097a355216d6c6b99511b20.tar.xz forums-81a1a21185abfc230097a355216d6c6b99511b20.zip | |
[feature/avatars] Properly implement custom HTML in the interface
Previously the driver class added a variable that defined wether an avatar
driver would return custom HTML. The existence of this variable was
implied in the interface. It's also not needed which is why it has been
removed.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 669641de70..a7b28acac1 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1368,12 +1368,14 @@ function get_avatar($row, $alt, $ignore_config = false) $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $avatar = $phpbb_avatar_manager->get_driver($row['avatar_type']); + $html = ''; if ($avatar) { - if ($avatar->custom_html) + $html = $avatar->get_custom_html($row, $ignore_config, $alt); + if (!empty($html)) { - return $avatar->get_custom_html($row, $ignore_config, $alt); + return $html; } $avatar_data = $avatar->get_data($row, $ignore_config); @@ -1383,8 +1385,6 @@ function get_avatar($row, $alt, $ignore_config = false) $avatar_data['src'] = ''; } - $html = ''; - if (!empty($avatar_data['src'])) { $html = '<img src="' . $avatar_data['src'] . '" ' . |