mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11602] Do not call localize_errors() if avatars are disabled

Browse Source 
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.

PHPBB3-11602
This commit is contained in:
Marc Alexander
2013-06-11 14:10:49 +02:00
parent e5d02f4b0c
commit 2d934704e2
2 changed files with 2 additions and 2 deletions
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);
if (!$update)
if (isset($phpbb_avatar_manager) && !$update)
{
// Merge any avatar errors into the primary error array
$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
$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));