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

[ticket/11842] Use avatar_data for obtaining driver that should be deleted

Browse source 
PHPBB3-11842
This commit is contained in:
Marc Alexander 2013-12-04 15:42:17 +01:00
parent 33f4d267ef
commit abb2def48d
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -383,7 +383,7 @@ class acp_groups
} }
else else
{ {
$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']); $driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
if ($driver) if ($driver)
{ {
$driver->delete($avatar_data); $driver->delete($avatar_data);

2
phpBB/includes/acp/acp_users.php
View file

@ -1775,7 +1775,7 @@ class acp_users
} }
else else
{ {
$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']); $driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
if ($driver) if ($driver)
{ {
$driver->delete($avatar_data); $driver->delete($avatar_data);

2
phpBB/includes/ucp/ucp_groups.php
View file

@ -509,7 +509,7 @@ class ucp_groups
} }
else else
{ {
if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])) if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']))
{ {
$driver->delete($avatar_data); $driver->delete($avatar_data);
} }

2
phpBB/includes/ucp/ucp_profile.php
View file

@ -603,7 +603,7 @@ class ucp_profile
} }
else else
{ {
if ($driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type'])) if ($driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']))
{ {
$driver->delete($avatar_data); $driver->delete($avatar_data);
} }

9
tests/functional/avatar_acp_groups_test.php
View file

@ -69,4 +69,13 @@ class phpbb_functional_avatar_acp_groups_test extends phpbb_functional_common_av
{ {
$this->assert_avatar_submit($expected, $avatar_type, $data); $this->assert_avatar_submit($expected, $avatar_type, $data);
} }
// Test if avatar was really deleted
public function test_no_avatar_acp_groups()
{
$crawler = self::request('GET', $this->get_url() . '&sid=' . $this->sid);
$form = $crawler->selectButton($this->lang('SUBMIT'))->form();
$form_data = $form->getValues();
$this->assertEmpty($form_data['avatar_type']);
}
} }