diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:44:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-15 13:44:24 +0200 |
| commit | f1df8e2688bb9765833c18d90302a2f918646929 (patch) | |
| tree | 682c43dd2c2e669c421b43ffceb28dd745378e7f | |
| parent | 1127f8bbf842e9c494cce624e4e61a2e86706862 (diff) | |
| parent | 3768f7f2b8ff9dc5915385047e6b195d46de7503 (diff) | |
| download | forums-f1df8e2688bb9765833c18d90302a2f918646929.tar forums-f1df8e2688bb9765833c18d90302a2f918646929.tar.gz forums-f1df8e2688bb9765833c18d90302a2f918646929.tar.bz2 forums-f1df8e2688bb9765833c18d90302a2f918646929.tar.xz forums-f1df8e2688bb9765833c18d90302a2f918646929.zip | |
Merge branch '3.1.x'
| -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 4fdaee9561..60c9e9cc95 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -168,6 +168,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'), |