Merge pull request #3737 from javiexin/ticket/13980

[ticket/13980] Uploaded avatar not removed when new is uploaded
This commit is contained in:
Marc Alexander 2015-07-15 13:44:19 +02:00
commit 3768f7f2b8

View file

@ -161,6 +161,13 @@ class upload extends \phpbb\avatar\driver\driver
return false;
}
// Delete current avatar if not overwritten
$ext = substr(strrchr($row['avatar'], '.'), 1);
if ($ext && $ext !== $file->get('extension'))
{
$this->delete($row);
}
return array(
'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
'avatar_width' => $file->get('width'),