Merge pull request #20145 from nextcloud/bugfix/noid/generated-avatar…

…s-and-nophoto-cache Fix generated avatars and nophoto cache files
nextcloud · Mar 25, 2020 · ba14c41 · ba14c41
2 parents 3427653 + f3a5bd6
commit ba14c41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/dav/lib/CardDAV/PhotoCache.php b/apps/dav/lib/CardDAV/PhotoCache.php
@@ -108,15 +108,15 @@ private function init(ISimpleFolder $folder, Card $card): void {
 		$data = $this->getPhoto($card);
 
 		if ($data === false || !isset($data['Content-Type'])) {
-			$folder->newFile('nophoto');
+			$folder->newFile('nophoto', '');
 			return;
 		}
 
 		$contentType = $data['Content-Type'];
 		$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
@@ -252,7 +252,7 @@ public function getFile($size) {
 			$avatar->putContent($data);
 			$ext = 'png';
 
-			$this->folder->newFile('generated');
+			$this->folder->newFile('generated', '');
 			$this->config->setUserValue($this->user->getUID(), 'avatar', 'generated', 'true');
 		}