diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-06 21:09:07 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-06 21:09:07 +0100 |
| commit | 41710c745d5507aa71e25b125b0ae1485cc7ecc1 (patch) | |
| tree | 22b58ad607316acdca8fa8aab89fc94cdbc2b488 /phpBB/includes/acp/acp_groups.php | |
| parent | 111e02395c2879662e2a3d07558519b838ddb69a (diff) | |
| download | forums-41710c745d5507aa71e25b125b0ae1485cc7ecc1.tar forums-41710c745d5507aa71e25b125b0ae1485cc7ecc1.tar.gz forums-41710c745d5507aa71e25b125b0ae1485cc7ecc1.tar.bz2 forums-41710c745d5507aa71e25b125b0ae1485cc7ecc1.tar.xz forums-41710c745d5507aa71e25b125b0ae1485cc7ecc1.zip | |
[feature/avatars] Add function for localizing errors
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 3a72a8c7ef..d9452a902e 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -550,22 +550,8 @@ class acp_groups $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true); - /* - * Merge any avatar errors into the primary error array - * Drivers use language constants, so we need to map to the actual strings - */ - foreach ($avatar_error as $lang) - { - if (is_array($lang)) - { - $key = array_shift($lang); - $error[] = vsprintf($user->lang($key), $lang); - } - else - { - $error[] = $user->lang("$lang"); - } - } + // Merge any avatar errors into the primary error array + $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); $back_link = request_var('back_link', ''); |