diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 16:20:40 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-05-19 16:20:40 +0200 |
| commit | a0f76f73e9a5865d8144b3b3c2316a485794db24 (patch) | |
| tree | 7eaab9c8c4a4cab92bdde11040d6ebcde3bc9c2e | |
| parent | f49be858598f10abfb9c7886bd698cdec862fe1c (diff) | |
| parent | 6890bf9f8d97473d55f2d6819c8ec155f9d52658 (diff) | |
| download | forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.gz forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.bz2 forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.tar.xz forums-a0f76f73e9a5865d8144b3b3c2316a485794db24.zip | |
Merge remote-tracking branch 'marc1706/ticket/11535' into develop
* marc1706/ticket/11535:
[ticket/11535] Correctly merge avatar_errors array into primary error array
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 865810687b..37c49d7d72 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -381,6 +381,9 @@ class acp_groups $submit_ary['avatar_width'] = 0; $submit_ary['avatar_height'] = 0; } + + // Merge any avatar errors into the primary error array + $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); } // Validate the length of "Maximum number of allowed recipients per private message" setting. @@ -570,8 +573,11 @@ class acp_groups $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true); - // Merge any avatar errors into the primary error array - $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); + if (!$update) + { + // 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', ''); diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 50d13e00b1..a633ce448c 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -547,6 +547,9 @@ class ucp_groups $submit_ary['avatar_width'] = 0; $submit_ary['avatar_height'] = 0; } + + // Merge any avatars errors into the primary error array + $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); } if (!check_form_key('ucp_groups')) @@ -672,8 +675,11 @@ class ucp_groups } } - // Merge any avatars errors into the primary error array - $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); + if (!$update) + { + // Merge any avatars errors into the primary error array + $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); + } $template->assign_vars(array( 'S_EDIT' => true, |