diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-18 23:09:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-18 23:09:09 +0100 |
| commit | 959bc183bf21e77c694ac0b68cbda5b93ae79cd0 (patch) | |
| tree | dbfa092cf102529d15565e82a920276ea58b222d /phpBB/includes/ucp | |
| parent | d8510356d6a0f838017ae94bec1a5ed8254432da (diff) | |
| download | forums-959bc183bf21e77c694ac0b68cbda5b93ae79cd0.tar forums-959bc183bf21e77c694ac0b68cbda5b93ae79cd0.tar.gz forums-959bc183bf21e77c694ac0b68cbda5b93ae79cd0.tar.bz2 forums-959bc183bf21e77c694ac0b68cbda5b93ae79cd0.tar.xz forums-959bc183bf21e77c694ac0b68cbda5b93ae79cd0.zip | |
[feature/avatars] Handle deletion of avatars
Previously this wasn't handled correctly if at all.
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 6a1ad33ceb..77b2dc7054 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -565,7 +565,8 @@ class ucp_profile { $driver = str_replace('_', '.', request_var('avatar_driver', '')); $config_name = preg_replace('#^avatar.driver.#', '', $driver); - if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"]) + $av_delete = $request->variable('av_delete', ''); + if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"] && empty($av_delete)) { $avatar = $phpbb_avatar_manager->get_driver($driver); $result = $avatar->process_form($template, $avatar_data, $error); @@ -593,7 +594,6 @@ class ucp_profile } else { - // They are removing their avatar or are trying to play games with us if ($avatar = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])) { $avatar->delete($avatar_data); |