mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Marc/ticket/11842' into develop

Browse Source 
* Marc/ticket/11842:
  [ticket/11842] Add functional test for creating group
  [ticket/11842] Use avatar_data for obtaining driver that should be deleted
  [ticket/11842] Use type map for updating avatar types in database
  [ticket/11842] Add missing prefix for group id in avatar data
  [ticket/11842] Use only new avatar type in user_delete function
  [ticket/11842] Add migration file for updating avatar type in database
  [ticket/11842] Replace outdated occurences of user and group avatar_type
  [ticket/11842] Use group_id 0 and correct avatar name after creating group
This commit is contained in:
Joas Schilling
2013-12-04 17:20:20 +01:00
parent fa33abaf0d 80fa658e8f
commit b474917ba3
9 changed files with 120 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/acp_groups.php
View File

@@ -325,6 +325,10 @@ class acp_groups
// This is normalised data, without the group_ prefix
$avatar_data = \phpbb\avatar\manager::clean_row($group_row, 'group');
if (!isset($avatar_data['id']))
{
$avatar_data['id'] = 'g' . $group_id;
}
}
@@ -379,7 +383,7 @@ class acp_groups
}
else
{
$driver = $phpbb_avatar_manager->get_driver($user->data['user_avatar_type']);
$driver = $phpbb_avatar_manager->get_driver($avatar_data['avatar_type']);
if ($driver)
{
$driver->delete($avatar_data);

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

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