archive
/
nextcloud
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #20145 from nextcloud/bugfix/noid/generated-avatars-and-nophoto-cache

Browse Source 
Fix generated avatars and nophoto cache files
pull/20153/head
blizzz 4 years ago committed by GitHub
parent 3427653676 f3a5bd6753
commit ba14c41a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
apps/dav/lib/CardDAV/PhotoCache.php
Unescape Escape 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
Unescape Escape 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');
} }

Write Preview
Loading…
Cancel
Save