aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-12-04 15:42:17 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-12-04 15:42:17 +0100
commitabb2def48d7a946fd4d0a67f88682c9fa2556223 (patch)
tree860f0d16517b560b820773b63addcdb4c40ac0be /phpBB/includes/ucp
parent33f4d267ef9a3b65a1fbda82afa13ecc486b5c80 (diff)
downloadforums-abb2def48d7a946fd4d0a67f88682c9fa2556223.tar
forums-abb2def48d7a946fd4d0a67f88682c9fa2556223.tar.gz
forums-abb2def48d7a946fd4d0a67f88682c9fa2556223.tar.bz2
forums-abb2def48d7a946fd4d0a67f88682c9fa2556223.tar.xz
forums-abb2def48d7a946fd4d0a67f88682c9fa2556223.zip
[ticket/11842] Use avatar_data for obtaining driver that should be deleted
PHPBB3-11842
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php2
-rw-r--r--phpBB/includes/ucp/ucp_profile.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 716289eded..7c4bc8f617 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -509,7 +509,7 @@ class ucp_groups
}
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);
}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index f7c6aca9e8..2252b2ea17 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -603,7 +603,7 @@ class ucp_profile
}
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);
}