makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/avatars] Small fixes

Browse source 
PHPBB3-10018
This commit is contained in:
Marc Alexander 2012-11-25 15:03:35 +01:00
parent 67c2e48d15
commit 6d061304af
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/includes/acp/acp_groups.php
View file

@ -337,6 +337,7 @@ class acp_groups
$driver = str_replace('_', '.', request_var('avatar_driver', '')); $driver = str_replace('_', '.', request_var('avatar_driver', ''));
$config_name = preg_replace('#^avatar\.driver.#', '', $driver); $config_name = preg_replace('#^avatar\.driver.#', '', $driver);
$avatar_delete = $request->variable('avatar_delete', ''); $avatar_delete = $request->variable('avatar_delete', '');
if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete)) if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($avatar_delete))
{ {
$avatar = $phpbb_avatar_manager->get_driver($driver); $avatar = $phpbb_avatar_manager->get_driver($driver);
@ -344,19 +345,15 @@ class acp_groups
if ($result && empty($avatar_error)) if ($result && empty($avatar_error))
{ {
$result = array( $result['avatar_type'] = $driver;
'avatar_type' => $driver,
'avatar' => $result['avatar'],
'avatar_width' => $result['avatar_width'],
'avatar_height' => $result['avatar_height'],
);
$submit_ary = array_merge($submit_ary, $result); $submit_ary = array_merge($submit_ary, $result);
} }
} }
else 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); $avatar->delete($avatar_data);
} }