diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:28:59 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-28 16:28:59 +0200 |
| commit | 9e0a075be15e1b40d4a8917bf01bed3861f7fa77 (patch) | |
| tree | b9be83406ce7ce775042fea2a8b7a1e6623d009c | |
| parent | e91e525e8a81f3bd7a90bbb7b94a351f950003d8 (diff) | |
| parent | 90d18356a077dab1b0044cff40638a870ad757b0 (diff) | |
| download | forums-9e0a075be15e1b40d4a8917bf01bed3861f7fa77.tar forums-9e0a075be15e1b40d4a8917bf01bed3861f7fa77.tar.gz forums-9e0a075be15e1b40d4a8917bf01bed3861f7fa77.tar.bz2 forums-9e0a075be15e1b40d4a8917bf01bed3861f7fa77.tar.xz forums-9e0a075be15e1b40d4a8917bf01bed3861f7fa77.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14070] Properly pass whether config should be ignored for avatars
| -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 f63ff3ecd4..6bc5d91ac4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4020,7 +4020,7 @@ function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) /* @var $phpbb_avatar_manager \phpbb\avatar\manager */ $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); - $driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], $ignore_config); + $driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], !$ignore_config); $html = ''; if ($driver) |