diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-10-20 14:30:29 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-10-20 14:30:29 -0700 |
| commit | 3c38f4e20a3efc035d5cf6f56ab9901150a10331 (patch) | |
| tree | d18c28388b4c178183685e50a3cbe12b0828cc3c /phpBB/includes/ucp | |
| parent | cc4219159831b38232064bb63cb6c9a7ff851dc4 (diff) | |
| parent | eda35d15f8b140f878c5e9fb91b0b4e47219a181 (diff) | |
| download | forums-3c38f4e20a3efc035d5cf6f56ab9901150a10331.tar forums-3c38f4e20a3efc035d5cf6f56ab9901150a10331.tar.gz forums-3c38f4e20a3efc035d5cf6f56ab9901150a10331.tar.bz2 forums-3c38f4e20a3efc035d5cf6f56ab9901150a10331.tar.xz forums-3c38f4e20a3efc035d5cf6f56ab9901150a10331.zip | |
[ticket/11936] Merge branch 'develop' into ticket/11936
PHPBB3-11936
Diffstat (limited to 'phpBB/includes/ucp')
| -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); |