diff options
| author | javiexin <javiexin@gmail.com> | 2015-07-09 15:31:28 +0200 |
|---|---|---|
| committer | javiexin <javiexin@gmail.com> | 2015-07-09 15:31:28 +0200 |
| commit | d0cdc5553a15de8b8cb9b26da24cbf4085b0813c (patch) | |
| tree | 07d4a50dc8cd0cde90c0bd3ec97c309d6e86c9f9 /phpBB | |
| parent | 352e9956748b29672f71762ae18bec331a47f337 (diff) | |
| download | forums-d0cdc5553a15de8b8cb9b26da24cbf4085b0813c.tar forums-d0cdc5553a15de8b8cb9b26da24cbf4085b0813c.tar.gz forums-d0cdc5553a15de8b8cb9b26da24cbf4085b0813c.tar.bz2 forums-d0cdc5553a15de8b8cb9b26da24cbf4085b0813c.tar.xz forums-d0cdc5553a15de8b8cb9b26da24cbf4085b0813c.zip | |
[ticket/13980] Uploaded avatar not removed when new is uploaded
Remove the previously uploaded avatar when a new one with a different
extension is uploaded, using existing delete method
PHPBB3-13980
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index eae96cd794..73147a85a0 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -161,14 +161,11 @@ 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')) { - $filename = $this->phpbb_root_path . $this->config['avatar_path'] . '/' . $this->config['avatar_salt'] . '_' . $row['id'] . '.' . $ext; - if (file_exists($filename)) - { - @unlink($filename); - } + $this->delete($row); } return array( |