diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 15:08:26 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 15:08:26 +0200 |
| commit | 6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc (patch) | |
| tree | 4cd93b08a3619ac5a8eb9470752e971b5225f784 /phpBB/includes/acp/acp_groups.php | |
| parent | b74b84dbec62c57dc7d0a0c9d01bb64f88a74338 (diff) | |
| parent | 2d934704e23c7ea41f1e94191858eac8fe30833a (diff) | |
| download | forums-6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc.tar forums-6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc.tar.gz forums-6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc.tar.bz2 forums-6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc.tar.xz forums-6f86c1dc7643c8f6928cb4f33322bc4447c0b9fc.zip | |
Merge remote-tracking branch 'marc1706/ticket/11602' into develop
* marc1706/ticket/11602:
[ticket/11602] Do not call localize_errors() if avatars are disabled
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 |
1 files changed, 1 insertions, 1 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)); |