mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Joas Schilling 2020-03-24 18:23:38 +01:00
parent 3e338c9075
commit f3a5bd6753
No known key found for this signature in database
GPG Key ID: 7076EA9751AACDDA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/CardDAV/PhotoCache.php
View File

@ -108,7 +108,7 @@ class PhotoCache {
$data = $this->getPhoto($card); $data = $this->getPhoto($card);
if ($data === false || !isset($data['Content-Type'])) { if ($data === false || !isset($data['Content-Type'])) {
$folder->newFile('nophoto'); $folder->newFile('nophoto', '');
return; return;
} }
@ -116,7 +116,7 @@ class PhotoCache {
$extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null; $extension = self::ALLOWED_CONTENT_TYPES[$contentType] ?? null;
if ($extension === null) { if ($extension === null) {
$folder->newFile('nophoto'); $folder->newFile('nophoto', '');
return; return;
} }

2
lib/private/Avatar/UserAvatar.php
View File

@ -252,7 +252,7 @@ class UserAvatar extends Avatar {
$avatar->putContent($data); $avatar->putContent($data);
$ext = 'png'; $ext = 'png';
$this->folder->newFile('generated'); $this->folder->newFile('generated', '');
$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true'); $this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
} }