diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-03-24 18:23:38 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-03-24 18:23:38 +0100 |
| commit | f3a5bd6753f10dc511ee90a1f042477120e0da33 (patch) | |
| tree | 76dc8046ceb90a584e88d6076fc1e24be0d17962 | |
| parent | 3e338c907533dd77599b576ecfadd44b3d1a9855 (diff) | |
| download | nextcloud-server-f3a5bd6753f10dc511ee90a1f042477120e0da33.tar.gz nextcloud-server-f3a5bd6753f10dc511ee90a1f042477120e0da33.zip | |
Fix generated avatars and nophoto cache files
Since nextcloud/server#19493 newFile() by default does not write the file anymore.
Setting an empty string as content will make it write the file immediate,
without having to call putContent() afterwards.
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | apps/dav/lib/CardDAV/PhotoCache.php | 4 | ||||
| -rw-r--r-- | lib/private/Avatar/UserAvatar.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php index c02280a0bec..99c0d1817c3 100644 --- a/apps/dav/lib/CardDAV/PhotoCache.php +++ b/apps/dav/lib/CardDAV/PhotoCache.php @@ -108,7 +108,7 @@ class PhotoCache { $data = $this->getPhoto($card); if ($data === false || !isset($data['Content-Type'])) { - $folder->newFile('nophoto'); + $folder->newFile('nophoto', ''); return; } @@ -116,7 +116,7 @@ class PhotoCache { $extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null; if ($extension === null) { - $folder->newFile('nophoto'); + $folder->newFile('nophoto', ''); return; } diff --git a/lib/private/Avatar/UserAvatar.php b/lib/private/Avatar/UserAvatar.php index fb434fc6947..485e53c249d 100644 --- a/lib/private/Avatar/UserAvatar.php +++ b/lib/private/Avatar/UserAvatar.php @@ -252,7 +252,7 @@ class UserAvatar extends Avatar { $avatar->putContent($data); $ext = 'png'; - $this->folder->newFile('generated'); + $this->folder->newFile('generated', ''); $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true'); } |