mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 11:35:24 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Marc Alexander
2015-07-15 13:44:24 +02:00
parent 1127f8bbf8 3768f7f2b8
commit f1df8e2688
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

@ -168,6 +168,13 @@ class upload extends \phpbb\avatar\driver\driver
return false; 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( return array(
'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'), 'avatar' => $row['id'] . '_' . time() . '.' . $file->get('extension'),
'avatar_width' => $file->get('width'), 'avatar_width' => $file->get('width'),