makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'marc1706/ticket/11535' into develop

Browse source 
* marc1706/ticket/11535:
  [ticket/11535] Correctly merge avatar_errors array into primary error array
This commit is contained in:
Andreas Fischer 2013-05-19 16:20:40 +02:00
commit a0f76f73e9
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/acp/acp_groups.php
View file

@ -381,6 +381,9 @@ class acp_groups
$submit_ary['avatar_width'] = 0; $submit_ary['avatar_width'] = 0;
$submit_ary['avatar_height'] = 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. // 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); $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
// Merge any avatar errors into the primary error array if (!$update)
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); {
// 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', ''); $back_link = request_var('back_link', '');

10
phpBB/includes/ucp/ucp_groups.php
View file

@ -547,6 +547,9 @@ class ucp_groups
$submit_ary['avatar_width'] = 0; $submit_ary['avatar_width'] = 0;
$submit_ary['avatar_height'] = 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')) if (!check_form_key('ucp_groups'))
@ -672,8 +675,11 @@ class ucp_groups
} }
} }
// Merge any avatars errors into the primary error array if (!$update)
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); {
// 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( $template->assign_vars(array(
'S_EDIT' => true, 'S_EDIT' => true,