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/11602' into develop

Browse source 
* marc1706/ticket/11602:
  [ticket/11602] Do not call localize_errors() if avatars are disabled
This commit is contained in:
Andreas Fischer 2013-06-11 15:08:26 +02:00
commit 6f86c1dc76
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -591,7 +591,7 @@ class acp_groups
$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true); $avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
if (!$update) if (isset($phpbb_avatar_manager) && !$update)
{ {
// Merge any avatar errors into the primary error array // Merge any avatar errors into the primary error array
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));

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

@ -691,7 +691,7 @@ class ucp_groups
} }
} }
if (!$update) if (isset($phpbb_avatar_manager) && !$update)
{ {
// Merge any avatars errors into the primary error array // Merge any avatars errors into the primary error array
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error)); $error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));