diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
| commit | 68f001aaaf761268975d38d7ddcbdf024bb26def (patch) | |
| tree | afa75c51f61239f8ed842de8a8487a1b155ca69d /phpBB/includes/acp/acp_groups.php | |
| parent | 6fc997924c2c9792c8151db67e3273202951de3e (diff) | |
| parent | b3487b3167632f47d98eef25692924aa7ab25863 (diff) | |
| download | forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.gz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.bz2 forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.xz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600
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)); |