makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 12:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2016-01-31 20:05:07 +01:00
commit 0d93af8324
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1929,8 +1929,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);