1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00

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

* 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

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);
// 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);