diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:44:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:44:19 +0200 |
| commit | 3768f7f2b8ff9dc5915385047e6b195d46de7503 (patch) | |
| tree | 37bd14087221a9f5eb9822b2b2c96cffb40dbbf0 /phpBB/phpbb/avatar | |
| parent | 05f1476fc99e1c3c5142cf228b00b48b4e0e133e (diff) | |
| parent | d0cdc5553a15de8b8cb9b26da24cbf4085b0813c (diff) | |
| download | forums-3768f7f2b8ff9dc5915385047e6b195d46de7503.tar forums-3768f7f2b8ff9dc5915385047e6b195d46de7503.tar.gz forums-3768f7f2b8ff9dc5915385047e6b195d46de7503.tar.bz2 forums-3768f7f2b8ff9dc5915385047e6b195d46de7503.tar.xz forums-3768f7f2b8ff9dc5915385047e6b195d46de7503.zip | |
Merge pull request #3737 from javiexin/ticket/13980
[ticket/13980] Uploaded avatar not removed when new is uploaded
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index ee36243844..73147a85a0 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -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'), |