diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 15:03:35 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-25 15:03:35 +0100 |
| commit | 6d061304afaa703a5305a06a903356d1c48ff2ee (patch) | |
| tree | 186a2018fa406e2622d24d4be3240a6f47ef902f /phpBB/includes/acp/acp_groups.php | |
| parent | 67c2e48d15d6e4ddd244dd2e126f906ed25be1ef (diff) | |
| download | forums-6d061304afaa703a5305a06a903356d1c48ff2ee.tar forums-6d061304afaa703a5305a06a903356d1c48ff2ee.tar.gz forums-6d061304afaa703a5305a06a903356d1c48ff2ee.tar.bz2 forums-6d061304afaa703a5305a06a903356d1c48ff2ee.tar.xz forums-6d061304afaa703a5305a06a903356d1c48ff2ee.zip | |
[feature/avatars] Small fixes
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index c09f447f76..136ceeff3c 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -337,6 +337,7 @@ class acp_groups $driver = str_replace('_', '.', request_var('avatar_driver', '')); $config_name = preg_replace('#^avatar\.driver.#', '', $driver); $avatar_delete = $request->variable('avatar_delete', ''); + if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) { $avatar = $phpbb_avatar_manager->get_driver($driver); @@ -344,19 +345,15 @@ class acp_groups if ($result && empty($avatar_error)) { - $result = array( - 'avatar_type' => $driver, - 'avatar' => $result['avatar'], - 'avatar_width' => $result['avatar_width'], - 'avatar_height' => $result['avatar_height'], - ); + $result['avatar_type'] = $driver; $submit_ary = array_merge($submit_ary, $result); } } else { - if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])) + $avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']) + if ($avatar) { $avatar->delete($avatar_data); } |