mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-12 20:56:40 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4150 from rxu/ticket/14439

Browse Source 
[ticket/14439] Do not call avatar manager if avatars are disabled
This commit is contained in:
Marc Alexander
2016-01-31 20:05:03 +01:00
parent 3c4f150859 68abcb9058
commit 89a34ff033
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_users.php
View File

@ -1899,8 +1899,12 @@ class acp_users
} }
} }
// Replace "error" strings with their real, localised form // Avatar manager is not initialized if avatars are disabled
$error = $phpbb_avatar_manager->localize_errors($user, $error); if (isset($phpbb_avatar_manager))
{
// Replace "error" strings with their real, localised form
$error = $phpbb_avatar_manager->localize_errors($user, $error);
}
$avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true); $avatar = phpbb_get_user_avatar($user_row, 'USER_AVATAR', true);