diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-06-11 14:10:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-06-11 14:54:22 +0200 |
| commit | 2d934704e23c7ea41f1e94191858eac8fe30833a (patch) | |
| tree | e7a89bfc0418df5e8fa08ff45d865d95b43fae1a /phpBB/includes | |
| parent | e5d02f4b0caf8dbac7acdb44b096d28660977cd2 (diff) | |
| download | forums-2d934704e23c7ea41f1e94191858eac8fe30833a.tar forums-2d934704e23c7ea41f1e94191858eac8fe30833a.tar.gz forums-2d934704e23c7ea41f1e94191858eac8fe30833a.tar.bz2 forums-2d934704e23c7ea41f1e94191858eac8fe30833a.tar.xz forums-2d934704e23c7ea41f1e94191858eac8fe30833a.zip | |
[ticket/11602] Do not call localize_errors() if avatars are disabled
The avatar manager's method localize_errors() shouldn't be called if
avatars are disabled in the config.
PHPBB3-11602
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 847ccfb3cc..c79699d465 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -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)); diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index af08533a7d..aada0525a8 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -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)); |