diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-08 22:54:26 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-08 22:54:26 +0200 |
| commit | 01097a24b50a6ffa0662740bbf418399ed5623f2 (patch) | |
| tree | 243924516f0af98657026b19fb90b8a6edcda5cf /phpBB/includes/functions.php | |
| parent | 2fbfb0e00436acc090a55e1739cf8bdd3b5c4497 (diff) | |
| parent | f576f42b4d3c607aee6b30154502adfed79301fb (diff) | |
| download | forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.gz forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.bz2 forums-01097a24b50a6ffa0662740bbf418399ed5623f2.tar.xz forums-01097a24b50a6ffa0662740bbf418399ed5623f2.zip | |
Merge branch '3.1.x'
Conflicts:
tests/template/template_includecss_test.php
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bb4fc5dbae..49fd732bb8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4053,7 +4053,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) $src = 'src="' . $avatar_data['src'] . '"'; } - $html = '<img class="avatar" ' . $src . + $html = '<img class="avatar" ' . $src . ' ' . ($avatar_data['width'] ? ('width="' . $avatar_data['width'] . '" ') : '') . ($avatar_data['height'] ? ('height="' . $avatar_data['height'] . '" ') : '') . 'alt="' . ((!empty($user->lang[$alt])) ? $user->lang[$alt] : $alt) . '" />'; |