mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 01:06:48 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3737 from javiexin/ticket/13980

Browse Source 
[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
parent 05f1476fc9 d0cdc5553a
commit 3768f7f2b8
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/phpbb/avatar/driver/upload.php
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'),