diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-20 22:14:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-20 22:14:58 +0200 |
| commit | 953d31dc75d3d58ba7e5b816968d00b19f20ce6d (patch) | |
| tree | 11ce200d041bc1ab04fb5c1238ddbc4c4d4f894a | |
| parent | 9c299ad759638ab62a6f15f349890ffe02011582 (diff) | |
| parent | c7b88ee1d151772df5d537baf2a993eef15a2158 (diff) | |
| download | forums-953d31dc75d3d58ba7e5b816968d00b19f20ce6d.tar forums-953d31dc75d3d58ba7e5b816968d00b19f20ce6d.tar.gz forums-953d31dc75d3d58ba7e5b816968d00b19f20ce6d.tar.bz2 forums-953d31dc75d3d58ba7e5b816968d00b19f20ce6d.tar.xz forums-953d31dc75d3d58ba7e5b816968d00b19f20ce6d.zip | |
Merge remote-tracking branch 'prototech/ticket/11923' into develop
* prototech/ticket/11923:
[ticket/11923] Attempt to translate errors only if user can change avatar.
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 8ae7acaa11..3f58ce20b4 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -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); |