makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'prototech/ticket/11923' into develop

Browse source 
* prototech/ticket/11923:
  [ticket/11923] Attempt to translate errors only if user can change avatar.
This commit is contained in:
Andreas Fischer 2013-10-20 22:14:58 +02:00
commit 953d31dc75
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_profile.php
View file

@ -658,10 +658,10 @@ class ucp_profile
));
}
}
}
// Replace "error" strings with their real, localised form
$error = $phpbb_avatar_manager->localize_errors($user, $error);
}
$avatar = phpbb_get_user_avatar($user->data, 'USER_AVATAR', true);